Ensure bundle targets rebuild md5_sum

Bug: 1081861
Change-Id: Ife8c169371fafdfb5b4b45de8a4f71e28d600310
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2197150
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Michael Thiessen <mthiesse@chromium.org>
Cr-Commit-Position: refs/heads/master@{#768750}

build/config/android/internal_rules.gni

@@ -578,7 +578,7 @@ template("test_runner_script") {
                                "deps",
                                "public_deps",
                              ])
-      data_deps = []
+      data_deps = [ "//tools/android/md5sum" ]
       if (defined(invoker.data_deps)) {
         data_deps += invoker.data_deps
       }
@@ -2691,7 +2691,6 @@ if (enable_java_templates) {
     _script = "//build/android/gyp/apkbuilder.py"
     _apksigner = "$android_sdk_build_tools/lib/apksigner.jar"
     _zipalign = "$android_sdk_build_tools/zipalign"
-    _data_deps = [ "//tools/android/md5sum" ]
 
     _inputs = [
       invoker.build_config,
@@ -2841,7 +2840,6 @@ if (enable_java_templates) {
       depfile = "$target_gen_dir/$target_name.d"
       inputs = _inputs
       deps = _deps
-      data_deps = _data_deps
       data = _data
       outputs = _outputs
       script = _script

build/config/android/rules.gni

@@ -3279,6 +3279,7 @@ if (enable_java_templates) {
         _generated_script = "$root_build_dir/bin/${invoker.target_name}"
         script = "//build/android/gyp/create_apk_operations_script.py"
         outputs = [ _generated_script ]
+        data_deps = [ "//tools/android/md5sum" ]
         args = [
           "--script-output-path",
           rebase_path(_generated_script, root_build_dir),
@@ -3314,7 +3315,7 @@ if (enable_java_templates) {
         }
         if (_proguard_enabled && !_incremental_apk) {
           # Required by logcat command.
-          data_deps = [ "//build/android/stacktrace:java_deobfuscate" ]
+          data_deps += [ "//build/android/stacktrace:java_deobfuscate" ]
           data = [ "$_final_apk_path.mapping" ]
           args += [
             "--proguard-mapping-path",
@@ -3758,7 +3759,6 @@ if (enable_java_templates) {
       data_deps += [
         "//build/android/pylib/device/commands",
         "//tools/android/forwarder2",
-        "//tools/android/md5sum",
       ]
       if (defined(invoker.apk_under_test)) {
         data_deps += [ invoker.apk_under_test ]
@@ -3920,10 +3920,7 @@ if (enable_java_templates) {
         "//base:base_java",
         "//testing/android/reporter:reporter_java",
       ]
-      data_deps += [
-        "//build/android/pylib/device/commands",
-        "//tools/android/md5sum",
-      ]
+      data_deps += [ "//build/android/pylib/device/commands" ]
       if (host_os == "linux") {
         data_deps += [ "//tools/android/forwarder2" ]
       }
@@ -4889,7 +4886,10 @@ if (enable_java_templates) {
         _keystore_path,
         _bundle_path,
       ]
-      data_deps = [ "//build/android:bundle_wrapper_script_py" ]
+      data_deps = [
+        "//build/android:bundle_wrapper_script_py",
+        "//tools/android/md5sum",
+      ]
 
       deps = [ _base_module_build_config_target ]
       args = [