Make it possible to run peerconnection_unittests on Android.

webrtc/build/apk_tests.gyp

 # Copyright (c) 2013 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.
 
 # This file exists in two versions. A no-op version under
 # webrtc/build/apk_tests_noop.gyp and this one. This gyp file builds the apk
@@ skipping 43 matching lines @@
         'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)common_video_unittests<(SHARED_LIB_SUFFIX)',
       },
       'dependencies': [
         '<(webrtc_root)/common_video/common_video_unittests.gyp:common_video_unittests',
       ],
       'includes': [
         '../../build/apk_test.gypi',
       ],
     },
     {
-      'target_name': 'libjingle_peerconnection_unittest_apk',
+      'target_name': 'peerconnection_unittests_apk',
       'type': 'none',
       'variables': {
-        'test_suite_name': 'libjingle_peerconnection_unittest',
-        'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)libjingle_peerconnection_unittest<(SHARED_LIB_SUFFIX)',
+        'test_suite_name': 'peerconnection_unittests',
+        'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)peerconnection_unittests<(SHARED_LIB_SUFFIX)',
       },
       'dependencies': [
-        '<(DEPTH)/talk/libjingle_tests.gyp:libjingle_peerconnection_unittest',
+        '<(DEPTH)/talk/libjingle_tests.gyp:peerconnection_unittests',
         '<(DEPTH)/talk/libjingle.gyp:libjingle_peerconnection_java',
       ],
       'includes': [
-        # Use webrtc copy of apk_test.gypi to allow test executables starting
-        # with "lib". See http://crbug.com/543820 for more details.
-        '../build/apk_test.gypi',
+        '../../build/apk_test.gypi',
       ],
     },
     {
       'target_name': 'modules_tests_apk',
       'type': 'none',
       'variables': {
         'test_suite_name': 'modules_tests',
         'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)modules_tests<(SHARED_LIB_SUFFIX)',
       },
       'dependencies': [
@@ skipping 153 matching lines @@
         'never_lint': 1,
       },
       'includes': [
         '../../build/java.gypi',
       ],
     },
   ],
 }