Make instrumentation test dependency on a support APK explicit

build/android/test_runner.gypi

Index: build/android/test_runner.gypi
diff --git a/build/android/test_runner.gypi b/build/android/test_runner.gypi
index 92f355bf1fb4abe73d3480f728ac5f7ecfd7665b..52ad0876c671536990a0eea8facf506e684f9021 100644
--- a/build/android/test_runner.gypi
+++ b/build/android/test_runner.gypi
@@ -33,6 +33,7 @@
   'variables': {
     'variables': {
       'isolate_file%': '',
+      'support_apk_name%': '',
     },
     'test_runner_args': ['--output-directory', '<(PRODUCT_DIR)'],
     'conditions': [
@@ -43,6 +44,14 @@
       ['test_type == "instrumentation"', {
         'test_runner_args': ['--test-apk', '<(apk_name)'],
         'script_name': 'run_<(_target_name)',
+        'conditions': [
+          ['support_apk_name != ""', {
+            'test_runner_args': [
+              '--support-apk',
+              'apks/<(support_apk_name).apk'

[jbudorick, 2015/06/25 02:59:59]

You could either do this as

  '<(PRODUCT_DIR)/apks/<(support_apk_name).apk'

or have the including .gyp file provide a support_apk_path (set to something
similar). I'd prefer the latter, but it's not a strong preference.

+            ],
+          }],
+        ],
       }],
       ['isolate_file != ""', {
         'test_runner_args': ['--isolate-file-path', '<(isolate_file)']