Move talk/media to webrtc/media

webrtc/media/media_tests.gypi

Index: webrtc/media/media_tests.gypi
diff --git a/webrtc/media/media_tests.gypi b/webrtc/media/media_tests.gypi
new file mode 100644
index 0000000000000000000000000000000000000000..4803a92664ef417d72735bb0ff96fd9d210cbb60
--- /dev/null
+++ b/webrtc/media/media_tests.gypi
@@ -0,0 +1,171 @@
+# Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS.  All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+
+{
+  'includes': [ '../build/common.gypi', ],
+  'targets': [
+    {
+      'target_name': 'rtc_unittest_main',

[Taylor Brandstetter, 2016/01/27 02:39:43]

The name "rtc_unittest_main" makes me confuse this with the "rtc_unittests"
target. Would it make more sense to call it "rtc_media_unittest_main"?

[kjellander_webrtc, 2016/02/04 21:52:10]

I'm not sure what to name it, it's depended upon by peerconnection_unittests and
libjingle_p2p_unittest as well so that won't be an improvement. Let's keep it as
is for this CL.

+      'type': 'static_library',
+      'dependencies': [
+        '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '<(libyuv_dir)/include',
+          '<(DEPTH)/testing/gtest/include',
+          '<(DEPTH)/testing/gtest',
+        ],
+      },
+      'conditions': [
+        ['build_libyuv==1', {
+          'dependencies': ['<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',],
+        }],
+        ['OS=="ios"', {
+          # TODO(kjellander): Make the code compile without disabling these.
+          # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307
+          'cflags': [
+            '-Wno-unused-variable',
+          ],
+          'xcode_settings': {
+            'WARNING_CFLAGS': [
+              '-Wno-unused-variable',
+            ],
+          },
+        }],
+      ],
+      'include_dirs': [
+         '<(DEPTH)/testing/gtest/include',
+         '<(DEPTH)/testing/gtest',
+       ],
+      'sources': [
+        'base/fakecapturemanager.h',
+        'base/fakemediaengine.h',
+        'base/fakenetworkinterface.h',
+        'base/fakertp.h',
+        'base/fakevideocapturer.h',
+        'base/fakevideorenderer.h',
+        'base/testutils.cc',
+        'base/testutils.h',
+        'devices/fakedevicemanager.h',
+        'webrtc/fakewebrtccall.cc',
+        'webrtc/fakewebrtccall.h',
+        'webrtc/fakewebrtccommon.h',
+        'webrtc/fakewebrtcdeviceinfo.h',
+        'webrtc/fakewebrtcvcmfactory.h',
+        'webrtc/fakewebrtcvideocapturemodule.h',
+        'webrtc/fakewebrtcvideoengine.h',
+        'webrtc/fakewebrtcvoiceengine.h',
+      ],
+      # TODO(kjellander): Make the code compile without disabling these flags.
+      # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307
+      'cflags_cc!': [
+        '-Wnon-virtual-dtor',
+      ],
+    },  # target rtc_unittest_main
+    {
+      'target_name': 'libjingle_media_unittest',

[Taylor Brandstetter, 2016/01/27 02:39:42]

Should this be rtc_media_unittests, to match the comment below?

[kjellander_webrtc, 2016/02/04 21:52:10]

Yes, but in order to have passing trybots for this CL I need to keep it
unchanged. I want to be sure not to break the test. Then I can rename the test +
update the bot configs in a separate (much smalller CL).

+      'type': 'executable',
+      'dependencies': [
+        '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
+        '<(webrtc_root)/media/media.gyp:rtc_media',
+        'rtc_unittest_main',
+      ],
+      'sources': [
+        'base/capturemanager_unittest.cc',
+        'base/codec_unittest.cc',
+        'base/rtpdataengine_unittest.cc',
+        'base/rtpdump_unittest.cc',
+        'base/rtputils_unittest.cc',
+        'base/streamparams_unittest.cc',
+        'base/turnutils_unittest.cc',
+        'base/videoadapter_unittest.cc',
+        'base/videocapturer_unittest.cc',
+        'base/videocommon_unittest.cc',
+        'base/videoengine_unittest.h',
+        'base/videoframe_unittest.h',
+        'devices/dummydevicemanager_unittest.cc',
+        'devices/filevideocapturer_unittest.cc',
+        'sctp/sctpdataengine_unittest.cc',
+        'webrtc/simulcast_unittest.cc',
+        'webrtc/webrtcmediaengine_unittest.cc',
+        'webrtc/webrtcvideocapturer_unittest.cc',
+        'webrtc/webrtcvideoframe_unittest.cc',
+        'webrtc/webrtcvideoframefactory_unittest.cc',
+        # Disabled because some tests fail.
+        # TODO(ronghuawu): Reenable these tests.
+        # 'devices/devicemanager_unittest.cc',
+        'webrtc/webrtcvideoengine2_unittest.cc',
+        'webrtc/webrtcvoiceengine_unittest.cc',
+      ],
+      # TODO(kjellander): Make the code compile without disabling these flags.
+      # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307
+      'cflags': [
+        '-Wno-sign-compare',
+      ],
+      'cflags_cc!': [
+        '-Wnon-virtual-dtor',
+        '-Woverloaded-virtual',
+      ],
+      'msvs_disabled_warnings': [
+        4245,  # conversion from 'int' to 'uint32_t', signed/unsigned mismatch.
+        4389,  # signed/unsigned mismatch.
+      ],
+      'conditions': [
+        ['OS=="win"', {
+          'conditions': [
+            ['use_openssl==0', {
+              'dependencies': [
+                '<(DEPTH)/net/third_party/nss/ssl.gyp:libssl',
+                '<(DEPTH)/third_party/nss/nss.gyp:nspr',
+                '<(DEPTH)/third_party/nss/nss.gyp:nss',
+              ],
+            }],
+          ],
+          'msvs_settings': {
+            'VCLinkerTool': {
+              'AdditionalDependencies': [
+                # TODO(ronghuawu): Since we've included strmiids in
+                # libjingle_media target, we shouldn't need this here.
+                # Find out why it doesn't work without this.
+                'strmiids.lib',
+              ],
+            },
+          },
+        }],
+        ['OS=="win" and clang==1', {
+          'msvs_settings': {
+            'VCCLCompilerTool': {
+              'AdditionalOptions': [
+                # Disable warnings failing when compiling with Clang on Windows.
+                # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366
+                '-Wno-sign-compare',
+                '-Wno-unused-function',
+              ],
+            },
+          },
+        },],
+        ['clang==1', {
+          # TODO(kjellander): Make the code compile without disabling these.
+          # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307
+          'cflags!': [
+            '-Wextra',
+          ],
+          'xcode_settings': {
+            'WARNING_CFLAGS!': ['-Wextra'],
+          },
+        }],
+        ['OS=="ios"', {
+          'sources!': [
+            'sctp/sctpdataengine_unittest.cc',
+          ],
+        }],
+      ],
+    },  # target rtc_media_unittests
+  ],
+}