👔 Make instrumentation tests declare their runtime_deps

build/config/android/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("//base/android/linker/config.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/toolchain/toolchain.gni")
 import("//third_party/android_platform/config.gni")
@@ skipping 1575 matching lines @@
     action("${_template_name}_dist_ijar") {
       script = "//build/android/gyp/create_dist_jar.py"
       depfile = "$target_gen_dir/$target_name.d"
       inputs = [
         _build_config,
       ]
       outputs = [
         depfile,
         "${_dist_ijar_path}",
       ]
+      data = [
+        _dist_ijar_path,
+      ]
       args = [
         "--depfile",
         rebase_path(depfile, root_build_dir),
         "--output",
         rebase_path("${_dist_ijar_path}", root_build_dir),
         "--inputs=@FileArg($_rebased_build_config:dist_jar:all_interface_jars)",
       ]
       deps = [
         ":$build_config_target",  # Generates the build config file.
         ":$java_target",  # Generates the jar file.
@@ skipping 436 matching lines @@
     public_deps = [
       ":$_apk_target_name",
       ":$_test_runner_target_name",
 
       # Required by test runner to enumerate test list.
       ":${_apk_target_name}_dist_ijar",
     ]
     if (defined(invoker.apk_under_test)) {
       public_deps += [ invoker.apk_under_test ]
     }
+    if (defined(invoker.isolate_file)) {
+      isolate_values = exec_script("//build/gypi_to_gn.py",
+                                   [
+                                     rebase_path(invoker.isolate_file),
+                                     "--replace",
+                                     "<(DEPTH)=/",
+                                   ],
+                                   "scope",
+                                   [ invoker.isolate_file ])
+      data = isolate_values.files
+    }
   }
 
   # TODO(GYP): Delete once recipes no longer use this target.
   group("${target_name}_run") {
     public_deps = [
       ":${invoker.target_name}",
     ]
   }
   group("${target_name}_incremental") {
     public_deps = [
@@ skipping 341 matching lines @@
       "--target",
       rebase_path(invoker.target, root_build_dir),
       "--output-directory",
       rebase_path(root_out_dir, root_build_dir),
     ]
     if (defined(invoker.flag_name)) {
       args += [ "--flag-name=${invoker.flag_name}" ]
     }
   }
 }