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 1528 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_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.")
     }
 
     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
   }
 }