Revert of [android] Tweak data deps to include two chromium tool bina…

…ries. (patchset chromium#2 id:20001 of https://codereview.chromium.org/2488013003/ )

Reason for revert:
Causes dump_syms not to be built, official build bots failing.

https://bugs.chromium.org/p/chromium/issues/detail?id=664423&q=dump_syms&colspec=ID%20Pri%20M%20Stars%20ReleaseBlock%20Component%20Status%20Owner%20Summary%20OS%20Modified&desc=2

Original issue's description:
> [android] Tweak data deps to include two chromium tool binaries.
>
> This includes:
>  - //tools/android/md5sum:md5sum_bin($host_toolchain) -- we had previously
>     only depended on the symlink, not the target thereof
>  - //build/android/pylib/device/commands -- we previously only had it set
>     as a dependency of the forwarder & incremental APKs
>
> This should prevent bots running chromium tests from downloading the devil
> versions stored in GS.
>
> BUG=664211
>
> Committed: https://crrev.com/459473d91b7a627024b3dbf016fa599b79c13845
> Cr-Commit-Position: refs/heads/master@{#431378}

TBR=dpranke@chromium.org,jbudorick@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=664211

Review-Url: https://codereview.chromium.org/2488353003
Cr-Commit-Position: refs/heads/master@{#431552}

build/android/pylib/device/commands/BUILD.gn

@@ -6,14 +6,11 @@ import("//build/config/android/rules.gni")
 
 group("commands") {
   data_deps = [
-    ":chromium_commands_java",
+    ":chromium_commands",
   ]
 }
 
-android_library("chromium_commands_java") {
+android_library("chromium_commands") {
   java_files = [ "java/src/org/chromium/android/commands/unzip/Unzip.java" ]
   dex_path = "$root_build_dir/lib.java/chromium_commands.dex.jar"
-  data = [
-    dex_path,
-  ]
 }

build/config/android/internal_rules.gni

@@ -31,6 +31,7 @@ _java_target_whitelist = [
 
   # TODO(agrieve): Rename targets below to match above patterns.
   "*android_webview/glue:glue",
+  "//build/android/pylib/device/commands:chromium_commands",
   "//build/android/rezip:rezip",
   "//chrome/test/android/cast_emulator:cast_emulator",
   "//mojo/public/java:bindings",

build/config/android/rules.gni

@@ -2314,7 +2314,7 @@ if (enable_java_templates) {
       install_script_name = _install_script_name
       deps += [ "//testing/android/broker:broker_java" ]
       data_deps += [
-        "//build/android/pylib/device/commands",
+        "//testing/android/driver:driver_apk",
         "//tools/android/forwarder2",
         "//tools/android/md5sum",
       ]
@@ -2446,10 +2446,7 @@ if (enable_java_templates) {
         "//testing/android/appurify_support:appurify_support_java",
         "//testing/android/reporter:reporter_java",
       ]
-      data_deps += [
-        "//build/android/pylib/device/commands",
-        "//tools/android/md5sum",
-      ]
+      data_deps += [ "//tools/android/md5sum" ]
       if (host_os == "linux") {
         data_deps += [ "//tools/android/forwarder2" ]
       }

build/symlink.gni

@@ -10,7 +10,6 @@ template("symlink") {
   action(target_name) {
     forward_variables_from(invoker,
                            [
-                             "data_deps",
                              "deps",
                              "testonly",
                              "visibility",
@@ -58,12 +57,9 @@ template("binary_symlink") {
                              "testonly",
                              "visibility",
                            ])
-    data_deps = [
+    deps = [
       invoker.binary_label,
     ]
-    if (defined(invoker.data_deps)) {
-      data_deps += invoker.data_deps
-    }
 
     _out_dir = get_label_info(invoker.binary_label, "root_out_dir")
     if (defined(invoker.binary_output_name)) {

tools/android/BUILD.gn

@@ -7,7 +7,6 @@
 group("android_tools") {
   deps = [
     "//build/android:wrapper_scripts",
-    "//build/android/pylib/device/commands",
     "//third_party/android_platform:stack_wrapper",
     "//third_party/catapult/telemetry:bitmaptools($host_toolchain)",
     "//tools/android/adb_reboot",