Rename APK tests workaround to make it more generic.

webrtc/webrtc_tests.gypi

 # 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.
 {
   'targets': [
     {
@@ skipping 311 matching lines @@
       ],
     },
   ],
   'conditions': [
     ['OS=="android"', {
       'targets': [
         {
           'target_name': 'rtc_unittests_apk_target',
           'type': 'none',
           'dependencies': [
-            '<(apk_tests_path):rtc_unittests_apk',
+            '<(android_tests_path):rtc_unittests_apk',
           ],
         },
         {
           'target_name': 'video_engine_tests_apk_target',
           'type': 'none',
           'dependencies': [
-            '<(apk_tests_path):video_engine_tests_apk',
+            '<(android_tests_path):video_engine_tests_apk',
           ],
         },
         {
           'target_name': 'webrtc_perf_tests_apk_target',
           'type': 'none',
           'dependencies': [
-            '<(apk_tests_path):webrtc_perf_tests_apk',
+            '<(android_tests_path):webrtc_perf_tests_apk',
           ],
         },
         {
           'target_name': 'webrtc_nonparallel_tests_apk_target',
           'type': 'none',
           'dependencies': [
-            '<(apk_tests_path):webrtc_nonparallel_tests_apk',
+            '<(android_tests_path):webrtc_nonparallel_tests_apk',
           ],
         },
       ],
       'conditions': [
         ['test_isolation_mode != "noop"',
           {
             'targets': [
               {
                 'target_name': 'rtc_unittests_apk_run',
                 'type': 'none',
                 'dependencies': [
-                  '<(apk_tests_path):rtc_unittests_apk',
+                  '<(android_tests_path):rtc_unittests_apk',
                 ],
                 'includes': [
                   'build/isolate.gypi',
                 ],
                 'sources': [
                   'rtc_unittests_apk.isolate',
                 ],
               },
               {
                 'target_name': 'video_engine_tests_apk_run',
                 'type': 'none',
                 'dependencies': [
-                  '<(apk_tests_path):video_engine_tests_apk',
+                  '<(android_tests_path):video_engine_tests_apk',
                 ],
                 'includes': [
                   'build/isolate.gypi',
                 ],
                 'sources': [
                   'video_engine_tests_apk.isolate',
                 ],
               },
               {
                 'target_name': 'webrtc_perf_tests_apk_run',
                 'type': 'none',
                 'dependencies': [
-                  '<(apk_tests_path):webrtc_perf_tests_apk',
+                  '<(android_tests_path):webrtc_perf_tests_apk',
                 ],
                 'includes': [
                   'build/isolate.gypi',
                 ],
                 'sources': [
                   'webrtc_perf_tests_apk.isolate',
                 ],
               },
               {
                 'target_name': 'webrtc_nonparallel_tests_apk_run',
                 'type': 'none',
                 'dependencies': [
-                  '<(apk_tests_path):webrtc_nonparallel_tests_apk',
+                  '<(android_tests_path):webrtc_nonparallel_tests_apk',
                 ],
                 'includes': [
                   'build/isolate.gypi',
                 ],
                 'sources': [
                   'webrtc_nonparallel_tests_apk.isolate',
                 ],
               },
             ],
           },
@@ skipping 51 matching lines @@
             'build/isolate.gypi',
           ],
           'sources': [
             'webrtc_perf_tests.isolate',
           ],
         },
       ],
     }],
   ],
 }