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 091ee4ac2ebc7051e855c45ecba0a2fb7392d1f3..4166978916c03401b68ac01456839dce6e90b3ed 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -1514,6 +1514,14 @@ template("test_runner_script") {
         "--test-apk",
         invoker.test_apk,
       ]
+      if (defined(invoker.support_apk_name)) {
+        _support_apk_name = invoker.support_apk_name
+
+        test_runner_args += [
+          "--support-apk",
+          "apks/$_support_apk_name.apk",

[dgn, 2015/06/24 21:29:50]

I tried to take a target (e.g. "//foo:foo_support_apk") as input and get the
path directly from it but I couldn't figure out how to do that.
get_target_outputs doesn't work since the target is defined in another file, I
also tried to see if the path was in the build_config file. Is there an
idiomatic GN way to do that?

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

I'm not that familiar with GN idioms, so +cjhopman

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

Yeah, can't really get the output from a label. This should require either a
path or an apk name.

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