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..e5bbfb829fd79b66e0789e2f2b5dfb804e7467cd 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,11 @@
       ['test_type == "instrumentation"', {
         'test_runner_args': ['--test-apk', '<(apk_name)'],
         'script_name': 'run_<(_target_name)',
+        'conditions': [
+          ['support_apk_name != ""', {
+            'test_runner_args+': ['--support-apk', '<(support_apk_name)'],
+          }],
+        ],
       }],
       ['isolate_file != ""', {
         'test_runner_args': ['--isolate-file-path', '<(isolate_file)']

[dgn, 2015/06/24 16:03:04]

My change works but I don't quite understand how isolate works here... isn't '+'
needed to append? how are both instrumentation and isolate be added to the
script then?

[jbudorick, 2015/06/24 17:46:39]

gyp seems to append to lists even if + isn't included.