Move talk/app/webrtc to webrtc/api

talk/libjingle_tests.gyp

Index: talk/libjingle_tests.gyp
diff --git a/talk/libjingle_tests.gyp b/talk/libjingle_tests.gyp
index 3ee120d4e2df9f8f3248fc5d990fe27ac6feb397..3a0d954c19e2b5afaf051aa4aac12234638430a3 100755
--- a/talk/libjingle_tests.gyp
+++ b/talk/libjingle_tests.gyp
@@ -152,8 +152,8 @@
       'type': 'executable',
       'dependencies': [
         '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
+        '<(webrtc_root)/api/api.gyp:libjingle_peerconnection',
         'libjingle.gyp:libjingle',
-        'libjingle.gyp:libjingle_peerconnection',
         'libjingle.gyp:libjingle_p2p',
         'libjingle_unittest_main',
       ],
@@ -186,171 +186,8 @@
         }],
       ],
     },  # target libjingle_p2p_unittest
-    {
-      'target_name': 'peerconnection_unittests',
-      'type': '<(gtest_target_type)',
-      'dependencies': [
-        '<(DEPTH)/testing/gmock.gyp:gmock',
-        '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
-        '<(webrtc_root)/common.gyp:webrtc_common',
-        'libjingle.gyp:libjingle',
-        'libjingle.gyp:libjingle_p2p',
-        'libjingle.gyp:libjingle_peerconnection',
-        'libjingle_unittest_main',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(DEPTH)/testing/gmock/include',
-        ],
-      },
-      'sources': [
-        'app/webrtc/datachannel_unittest.cc',
-        'app/webrtc/dtlsidentitystore_unittest.cc',
-        'app/webrtc/dtmfsender_unittest.cc',
-        'app/webrtc/fakemetricsobserver.cc',
-        'app/webrtc/fakemetricsobserver.h',
-        'app/webrtc/jsepsessiondescription_unittest.cc',
-        'app/webrtc/localaudiosource_unittest.cc',
-        'app/webrtc/mediastream_unittest.cc',
-        'app/webrtc/peerconnection_unittest.cc',
-        'app/webrtc/peerconnectionendtoend_unittest.cc',
-        'app/webrtc/peerconnectionfactory_unittest.cc',
-        'app/webrtc/peerconnectioninterface_unittest.cc',
-        # 'app/webrtc/peerconnectionproxy_unittest.cc',
-        'app/webrtc/remotevideocapturer_unittest.cc',
-        'app/webrtc/rtpsenderreceiver_unittest.cc',
-        'app/webrtc/statscollector_unittest.cc',
-        'app/webrtc/test/fakeaudiocapturemodule.cc',
-        'app/webrtc/test/fakeaudiocapturemodule.h',
-        'app/webrtc/test/fakeaudiocapturemodule_unittest.cc',
-        'app/webrtc/test/fakeconstraints.h',
-        'app/webrtc/test/fakedatachannelprovider.h',
-        'app/webrtc/test/fakedtlsidentitystore.h',
-        'app/webrtc/test/fakeperiodicvideocapturer.h',
-        'app/webrtc/test/fakevideotrackrenderer.h',
-        'app/webrtc/test/mockpeerconnectionobservers.h',
-        'app/webrtc/test/peerconnectiontestwrapper.h',
-        'app/webrtc/test/peerconnectiontestwrapper.cc',
-        'app/webrtc/test/testsdpstrings.h',
-        'app/webrtc/videosource_unittest.cc',
-        'app/webrtc/videotrack_unittest.cc',
-        'app/webrtc/webrtcsdp_unittest.cc',
-        'app/webrtc/webrtcsession_unittest.cc',
-      ],
-      'conditions': [
-        ['OS=="android"', {
-          'sources': [
-            'app/webrtc/test/androidtestinitializer.cc',
-            'app/webrtc/test/androidtestinitializer.h',
-          ],
-          'dependencies': [
-            '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
-            'libjingle.gyp:libjingle_peerconnection_jni',
-          ],
-        }],
-        ['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-unused-function',
-              ],
-            },
-          },
-        }],
-      ],
-    },  # target peerconnection_unittests
   ],
   'conditions': [
-    ['OS=="linux"', {
-      'variables': {
-        'junit_jar': '<(DEPTH)/third_party/junit-jar/junit-4.11.jar',
-      },
-      'targets': [
-        {
-          'target_name': 'libjingle_peerconnection_test_jar',
-          'type': 'none',
-          'dependencies': [
-            'libjingle.gyp:libjingle_peerconnection_jar',
-          ],
-          'actions': [
-            {
-              'variables': {
-                'java_src_dir': 'app/webrtc/javatests/src',
-                'java_files': [
-                  'app/webrtc/java/testcommon/src/org/webrtc/PeerConnectionTest.java',
-                  'app/webrtc/javatests/src/org/webrtc/PeerConnectionTestJava.java',
-                ],
-              },
-              'action_name': 'create_jar',
-              'inputs': [
-                'build/build_jar.sh',
-                '<@(java_files)',
-                '<(PRODUCT_DIR)/libjingle_peerconnection.jar',
-                '<(PRODUCT_DIR)/lib/libjingle_peerconnection_so.so',
-                '<(junit_jar)',
-              ],
-              'outputs': [
-                '<(PRODUCT_DIR)/libjingle_peerconnection_test.jar',
-              ],
-              'action': [
-                'build/build_jar.sh', '<(java_home)', '<@(_outputs)',
-                '<(INTERMEDIATE_DIR)',
-                '<(java_src_dir):<(PRODUCT_DIR)/libjingle_peerconnection.jar:<(junit_jar)',
-                '<@(java_files)'
-              ],
-            },
-          ],
-        },
-        {
-          'target_name': 'libjingle_peerconnection_java_unittest',
-          'type': 'none',
-          'actions': [
-            {
-              'action_name': 'copy libjingle_peerconnection_java_unittest',
-              'inputs': [
-                'app/webrtc/javatests/libjingle_peerconnection_java_unittest.sh',
-                '<(PRODUCT_DIR)/libjingle_peerconnection_test_jar',
-                '<(junit_jar)',
-              ],
-              'outputs': [
-                '<(PRODUCT_DIR)/libjingle_peerconnection_java_unittest',
-              ],
-              'action': [
-                'bash', '-c',
-                'rm -f <(PRODUCT_DIR)/libjingle_peerconnection_java_unittest && '
-                'sed -e "s@GYP_JAVA_HOME@<(java_home)@" '
-                '< app/webrtc/javatests/libjingle_peerconnection_java_unittest.sh '
-                '> <(PRODUCT_DIR)/libjingle_peerconnection_java_unittest && '
-                'cp <(junit_jar) <(PRODUCT_DIR) && '
-                'chmod u+x <(PRODUCT_DIR)/libjingle_peerconnection_java_unittest'
-              ],
-            },
-          ],
-        },
-      ],
-    }],
-    ['OS=="android"', {
-      'targets': [
-        {
-          'target_name': 'libjingle_peerconnection_android_unittest',
-          'type': 'none',
-          'dependencies': [
-            'libjingle.gyp:libjingle_peerconnection_java',
-          ],
-          'variables': {
-            'apk_name': 'libjingle_peerconnection_android_unittest',
-            'java_in_dir': 'app/webrtc/androidtests',
-            'resource_dir': 'app/webrtc/androidtests/res',
-            'additional_src_dirs': ['app/webrtc/java/testcommon'],
-            'native_lib_target': 'libjingle_peerconnection_so',
-            'is_test_apk': 1,
-          },
-          'includes': [ '../build/java_apk.gypi' ],
-        },
-      ],  # targets
-    }],  # OS=="android"
     ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
       # The >=10.7 above is required to make ARC link cleanly (e.g. as
       # opposed to _compile_ cleanly, which the library under test
@@ -412,17 +249,6 @@
         },  # target apprtc_signaling_gunit_test
       ],
     }],
-    ['OS=="android"', {
-      'targets': [
-        {
-          'target_name': 'peerconnection_unittests_apk_target',
-          'type': 'none',
-          'dependencies': [
-            '<(DEPTH)/webrtc/build/apk_tests.gyp:peerconnection_unittests_apk',
-          ],
-        },
-      ],
-    }],
     ['test_isolation_mode != "noop"', {
       'targets': [
         {
@@ -451,19 +277,6 @@
             'libjingle_p2p_unittest.isolate',
           ],
         },
-        {
-          'target_name': 'peerconnection_unittests_run',
-          'type': 'none',
-          'dependencies': [
-            'peerconnection_unittests',
-          ],
-          'includes': [
-            'build/isolate.gypi',
-          ],
-          'sources': [
-            'peerconnection_unittests.isolate',
-          ],
-        },
       ],
     }],
   ],