Make instrumentation test dependency on a support APK explicit

build/config/android/internal_rules.gni

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/android/config.gni")
 
 assert(is_android)
 
 rebased_android_sdk = rebase_path(android_sdk, root_build_dir)
 rebased_android_sdk_root = rebase_path(android_sdk_root, root_build_dir)
@@ skipping 1496 matching lines @@
       test_runner_args += [
         "--suite",
         invoker.test_suite,
       ]
     } else if (_test_type == "instrumentation") {
       assert(defined(invoker.test_apk))
       test_runner_args += [
         "--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.")
     }
 
     if (defined(invoker.isolate_file)) {
       test_runner_args += [
         "--isolate-file-path",
         rebase_path(invoker.isolate_file, root_build_dir),
       ]
     }
 
     generated_script = "$root_build_dir/bin/run_${_test_name}"
     outputs = [
       depfile,
       generated_script,
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }