Make instrumentation test dependency on a support APK explicit

build/config/android/internal_rules.gni

Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index a8da93af28e09172a6b459d1559a9ef9131f46ed..17f7ef3db78a0c32f70470881f2bf83700f4619b 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -1546,6 +1546,12 @@ template("test_runner_script") {
         "--test-apk",
         invoker.test_apk,
       ]
+      if (defined(invoker.support_apk_path)) {
+        test_runner_args += [
+          "--support-apk",
+          invoker.support_apk_path,

[cjhopman, 2015/06/30 23:07:13]

invoker.support_apk_path should be relative to the src root (because basically
all paths in gn should be relative to that). Then here, the script will need to
have it relative to the output directory and so this should be
"rebase_path(invoker.support_apk_path, root_build_dir)".

[dgn, 2015/07/01 09:56:28]

OK, I had done it on the caller's side:
https://chrome-internal-review.googlesource.com/#/c/220095/5/javatests/BUILD.gn

Moved the rebase_path call here.

+        ]
+      }
     } else {
       assert(false, "Invalid test type: $_test_type.")
     }