Allow test() targets to specify additional_apks

Bug: 381000093
Change-Id: I3d886ec49874ef2bfbcddd4e8454bc3e2715d5f5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6253565
Reviewed-by: Peter Wen <[email protected]>
Auto-Submit: Andrew Grieve <[email protected]>
Commit-Queue: Peter Wen <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1419272}
NOKEYCHECK=True
GitOrigin-RevId: a918301a44925e32015410767382fc333d7e8ee2

Author: agrieve

config/android/internal_rules.gni

@@ -734,12 +734,21 @@ template("test_runner_script") {
                                "public_deps",
                              ])
       data_deps = []
+      if (defined(invoker.apk_target)) {
+        data_deps += [ invoker.apk_target ]
+      }
       if (defined(invoker.data_deps)) {
         data_deps += invoker.data_deps
       }
+      if (defined(invoker.apk_under_test)) {
+        data_deps += [ invoker.apk_under_test ]
+      }
       if (defined(invoker.additional_apks)) {
         data_deps += invoker.additional_apks
       }
+      if (defined(invoker.data_deps)) {
+        data_deps += invoker.data_deps
+      }
       write_runtime_deps = _runtime_deps_file
     }
   }

config/android/rules.gni

@@ -3654,16 +3654,7 @@ if (!is_robolectric && enable_java_templates) {
       apk_target = invoker.android_test_apk
       incremental_apk = _incremental_apk
 
-      public_deps = [
-        ":$_apk_operations_target_name",
-        apk_target,
-      ]
-      if (defined(invoker.apk_under_test)) {
-        public_deps += [ invoker.apk_under_test ]
-      }
-      if (defined(invoker.additional_apks)) {
-        public_deps += invoker.additional_apks
-      }
+      public_deps = [ ":$_apk_operations_target_name" ]
       if (use_rts) {
         if (!defined(data_deps)) {
           data_deps = []