Move talk/session/media -> webrtc/pc

talk/app/webrtc/legacy_objc_api_tests.gyp

Index: talk/app/webrtc/legacy_objc_api_tests.gyp
diff --git a/talk/libjingle_tests.gyp b/talk/app/webrtc/legacy_objc_api_tests.gyp
similarity index 60%
rename from talk/libjingle_tests.gyp
rename to talk/app/webrtc/legacy_objc_api_tests.gyp
index f45a99c0252511ba47ad818aae4a4c9df1df1e0b..1d8b682c394e02885c61f4fc2cd57de6374f0b92 100755
--- a/talk/libjingle_tests.gyp
+++ b/talk/app/webrtc/legacy_objc_api_tests.gyp
@@ -25,47 +25,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 {
-  'includes': ['build/common.gypi'],
-  'targets': [
-    {
-      'target_name': 'libjingle_p2p_unittest',
-      'type': 'executable',
-      'dependencies': [
-        '<(webrtc_root)/api/api.gyp:libjingle_peerconnection',
-        '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
-        '<(webrtc_root)/webrtc.gyp:rtc_unittest_main',
-        'libjingle.gyp:libjingle_p2p',
-      ],
-      'include_dirs': [
-        '<(DEPTH)/third_party/libsrtp/srtp',
-      ],
-      'sources': [
-        'session/media/bundlefilter_unittest.cc',
-        'session/media/channel_unittest.cc',
-        'session/media/channelmanager_unittest.cc',
-        'session/media/currentspeakermonitor_unittest.cc',
-        'session/media/mediasession_unittest.cc',
-        'session/media/rtcpmuxfilter_unittest.cc',
-        'session/media/srtpfilter_unittest.cc',
-      ],
-      'conditions': [
-        ['build_libsrtp==1', {
-          'dependencies': [
-            '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
-          ],
-        }],
-        ['OS=="win"', {
-          'msvs_settings': {
-            'VCLinkerTool': {
-              'AdditionalDependencies': [
-                'strmiids.lib',
-              ],
-            },
-          },
-        }],
-      ],
-    },  # target libjingle_p2p_unittest
-  ],
+  'includes': ['../../build/common.gypi'],
   'conditions': [
     ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
       # The >=10.7 above is required to make ARC link cleanly (e.g. as
@@ -75,21 +35,21 @@
         {
           'target_name': 'libjingle_peerconnection_objc_test',
           'type': 'executable',
-          'includes': [ 'build/objc_app.gypi' ],
+          'includes': [ '../../build/objc_app.gypi' ],
           'dependencies': [
             '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
             '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default',
-            'libjingle.gyp:libjingle_peerconnection_objc',
+            'legacy_objc_api.gyp:libjingle_peerconnection_objc',
           ],
           'sources': [
-            'app/webrtc/objctests/RTCPeerConnectionSyncObserver.h',
-            'app/webrtc/objctests/RTCPeerConnectionSyncObserver.m',
-            'app/webrtc/objctests/RTCPeerConnectionTest.mm',
-            'app/webrtc/objctests/RTCSessionDescriptionSyncObserver.h',
-            'app/webrtc/objctests/RTCSessionDescriptionSyncObserver.m',
+            'objctests/RTCPeerConnectionSyncObserver.h',
+            'objctests/RTCPeerConnectionSyncObserver.m',
+            'objctests/RTCPeerConnectionTest.mm',
+            'objctests/RTCSessionDescriptionSyncObserver.h',
+            'objctests/RTCSessionDescriptionSyncObserver.m',
             # TODO(fischman): figure out if this works for ios or if it
             # needs a GUI driver.
-            'app/webrtc/objctests/mac/main.mm',
+            'objctests/mac/main.mm',
           ],
           'conditions': [
             ['OS=="mac"', {
@@ -107,7 +67,7 @@
         {
           'target_name': 'apprtc_signaling_gunit_test',
           'type': 'executable',
-          'includes': [ 'build/objc_app.gypi' ],
+          'includes': [ '../../build/objc_app.gypi' ],
           'dependencies': [
             '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
             '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default',
@@ -115,7 +75,7 @@
             '<(DEPTH)/third_party/ocmock/ocmock.gyp:ocmock',
           ],
           'sources': [
-            'app/webrtc/objctests/mac/main.mm',
+            'objctests/mac/main.mm',
             '<(webrtc_root)/examples/objc/AppRTCDemo/tests/ARDAppClientTest.mm',
           ],
           'conditions': [
@@ -128,22 +88,5 @@
         },  # target apprtc_signaling_gunit_test
       ],
     }],
-    ['test_isolation_mode != "noop"', {
-      'targets': [
-        {
-          'target_name': 'libjingle_p2p_unittest_run',
-          'type': 'none',
-          'dependencies': [
-            'libjingle_p2p_unittest',
-          ],
-          'includes': [
-            'build/isolate.gypi',
-          ],
-          'sources': [
-            'libjingle_p2p_unittest.isolate',
-          ],
-        },
-      ],
-    }],
   ],
 }