🏆 Allow Android test wrapper scripts to specify their timeouts in GN/GYP

testing/test.gni

Index: testing/test.gni
diff --git a/testing/test.gni b/testing/test.gni
index 13c434238acce1cc2fe63e34f783bf17fc509165..145e4643c01b73c3f5e1483d218eab6f853b3c42 100644
--- a/testing/test.gni
+++ b/testing/test.gni
@@ -25,6 +25,11 @@ template("test") {
       _output_name = invoker.output_name
     }
 
+    _wrapper_script_vars = [
+      "isolate_file",
+      "shard_timeout",
+    ]
+
     if (_use_raw_android_executable) {
       _exec_target = "${target_name}__exec"
       _dist_target = "${target_name}__dist"
@@ -80,12 +85,10 @@ template("test") {
         testonly = true
 
         deps = []
-        forward_variables_from(invoker,
-                               "*",
-                               _apk_specific_vars + [
-                                     "isolate_file",
-                                     "visibility",
-                                   ])
+        forward_variables_from(
+            invoker,
+            "*",
+            _apk_specific_vars + _wrapper_script_vars + [ "visibility" ])
 
         if (!defined(invoker.use_default_launcher) ||
             invoker.use_default_launcher) {
@@ -108,7 +111,7 @@ template("test") {
       _incremental_test_runner_target =
           "${_output_name}_incremental__test_runner_script"
       test_runner_script(_incremental_test_runner_target) {
-        forward_variables_from(invoker, [ "isolate_file" ])
+        forward_variables_from(invoker, _wrapper_script_vars)
         apk_target = ":$_apk_target"
         test_name = "${_output_name}_incremental"
         test_type = "gtest"
@@ -128,7 +131,7 @@ template("test") {
 
     _test_runner_target = "${_output_name}__test_runner_script"
     test_runner_script(_test_runner_target) {
-      forward_variables_from(invoker, [ "isolate_file" ])
+      forward_variables_from(invoker, _wrapper_script_vars)
       if (_use_raw_android_executable) {
         executable_dist_dir = "$root_out_dir/$_dist_target"
       } else {