android: make test_runner_py depend on stack_py, not stack_wrapper.

also ensure that stack_wrapper expresses a runtime dependency on
the script it's wrapping.

Bug: 790202
Change-Id: I2388b108dcf3f7a0db0fb1675d23cde5fbd43188
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1676735
Auto-Submit: John Budorick <jbudorick@chromium.org>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Reviewed-by: Yun Liu <yliuyliu@google.com>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#672332}

build/android/BUILD.gn

@@ -87,7 +87,7 @@ python_library("test_runner_py") {
   ]
   data_deps = [
     ":devil_chromium_py",
-    "//third_party/android_platform:stack_wrapper",
+    "//third_party/android_platform/development/scripts:stack_py",
   ]
   if (is_asan) {
     data_deps += [ "//tools/android/asan/third_party:asan_device_setup" ]

build/config/android/rules.gni

@@ -158,6 +158,12 @@ template("create_native_executable_dist") {
 #   }
 template("wrapper_script") {
   action_with_pydeps(target_name) {
+    forward_variables_from(invoker,
+                           [
+                             "data",
+                             "data_deps",
+                             "deps",
+                           ])
     _name = get_path_info(invoker.target, "name")
     _output = "$root_out_dir/bin/$_name"
 

third_party/android_platform/BUILD.gn

@@ -7,5 +7,8 @@ if (is_android) {
 
   wrapper_script("stack_wrapper") {
     target = "//third_party/android_platform/development/scripts/stack"
+    data_deps = [
+      "//third_party/android_platform/development/scripts:stack_py",
+    ]
   }
 }