Rename APK tests workaround to make it more generic.

webrtc/modules/modules.gyp

 # Copyright (c) 2011 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': [
@@ skipping 603 matching lines @@
           ],
         },
       ],
       'conditions': [
         ['OS=="android"', {
           'targets': [
             {
               'target_name': 'audio_codec_speed_tests_apk_target',
               'type': 'none',
               'dependencies': [
-                '<(apk_tests_path):audio_codec_speed_tests_apk',
+                '<(android_tests_path):audio_codec_speed_tests_apk',
               ],
             },
             {
               'target_name': 'audio_decoder_unittests_apk_target',
               'type': 'none',
               'dependencies': [
-                '<(apk_tests_path):audio_decoder_unittests_apk',
+                '<(android_tests_path):audio_decoder_unittests_apk',
               ],
             },
             {
               'target_name': 'modules_tests_apk_target',
               'type': 'none',
               'dependencies': [
-                '<(apk_tests_path):modules_tests_apk',
+                '<(android_tests_path):modules_tests_apk',
               ],
             },
             {
               'target_name': 'modules_unittests_apk_target',
               'type': 'none',
               'dependencies': [
-                '<(apk_tests_path):modules_unittests_apk',
+                '<(android_tests_path):modules_unittests_apk',
               ],
             },
           ],
           'conditions': [
             ['test_isolation_mode != "noop"',
               {
                 'targets': [
                   {
                     'target_name': 'audio_codec_speed_tests_apk_run',
                     'type': 'none',
                     'dependencies': [
-                      '<(apk_tests_path):audio_codec_speed_tests_apk',
+                      '<(android_tests_path):audio_codec_speed_tests_apk',
                     ],
                     'includes': [
                       '../build/isolate.gypi',
                     ],
                     'sources': [
                       'audio_codec_speed_tests_apk.isolate',
                     ],
                   },
                   {
                     'target_name': 'audio_decoder_unittests_apk_run',
                     'type': 'none',
                     'dependencies': [
-                      '<(apk_tests_path):audio_decoder_unittests_apk',
+                      '<(android_tests_path):audio_decoder_unittests_apk',
                     ],
                     'includes': [
                       '../build/isolate.gypi',
                     ],
                     'sources': [
                       'audio_decoder_unittests_apk.isolate',
                     ],
                   },
                   {
                     'target_name': 'modules_tests_apk_run',
                     'type': 'none',
                     'dependencies': [
-                      '<(apk_tests_path):modules_tests_apk',
+                      '<(android_tests_path):modules_tests_apk',
                     ],
                     'includes': [
                       '../build/isolate.gypi',
                     ],
                     'sources': [
                       'modules_tests_apk.isolate',
                     ],
                   },
                   {
                     'target_name': 'modules_unittests_apk_run',
                     'type': 'none',
                     'dependencies': [
-                      '<(apk_tests_path):modules_unittests_apk',
+                      '<(android_tests_path):modules_unittests_apk',
                     ],
                     'includes': [
                       '../build/isolate.gypi',
                     ],
                     'sources': [
                       'modules_unittests_apk.isolate',
                     ],
                   },
                 ],
               },
@@ skipping 66 matching lines @@
               'sources': [
                 'modules_unittests.isolate',
               ],
             },
           ],
         }],
       ],
     }], # include_tests
   ], # conditions
 }