[Merge to 51] Make the Android test apks depend on their run_ scripts

testing/test.gni

Index: testing/test.gni
diff --git a/testing/test.gni b/testing/test.gni
index 13c434238acce1cc2fe63e34f783bf17fc509165..cd81c6bfc6547c3173cba0eb3457ae59b94e78e1 100644
--- a/testing/test.gni
+++ b/testing/test.gni
@@ -25,6 +25,8 @@ template("test") {
       _output_name = invoker.output_name
     }
 
+    _test_runner_target = "${_output_name}__test_runner_script"
+
     if (_use_raw_android_executable) {
       _exec_target = "${target_name}__exec"
       _dist_target = "${target_name}__dist"
@@ -102,6 +104,16 @@ template("test") {
           install_script_name = "install_${invoker.output_name}"
         }
         deps += [ ":$_library_target" ]
+
+        # TODO(agrieve): Remove this data_dep once bots don't build the _apk
+        #     target (post-GYP).
+        # It's a bit backwards for the apk to depend on the runner script, since
+        # the apk is conceptually a runtime_dep of the script. However, it is
+        # currently necessary because the bots build this _apk target directly
+        # rather than the group() below.
+        data_deps = [
+          ":$_test_runner_target",
+        ]
       }
 
       # Incremental test targets work only for .apks.