👔 Make instrumentation tests declare their runtime_deps

build/config/android/rules.gni

Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 81267ed6e9713333c562dd4cef33f8b5500bae78..cf958eff200c4f8179943bf2210720f4eac25f3c 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1593,6 +1593,9 @@ template("android_apk") {
         depfile,
         "${_dist_ijar_path}",
       ]
+      data = [
+        _dist_ijar_path,
+      ]
       args = [
         "--depfile",
         rebase_path(depfile, root_build_dir),
@@ -2049,6 +2052,17 @@ template("instrumentation_test_apk") {
     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.