Revert of GN(Android): Stop specifying depfile under outputs

build/config/android/internal_rules.gni

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build_overrides/build.gni")
 import("//build/config/android/config.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 
 assert(is_android)
 
@@ skipping 133 matching lines @@
             _deps_configs += [ "$_dep_gen_dir/$_dep_name.build_config" ]
           }
         }
         sources = []
       }
       set_sources_assignment_filter([])
     }
     _rebased_deps_configs = rebase_path(_deps_configs, root_build_dir)
 
     outputs = [
+      depfile,
       build_config,
     ]
 
     args = [
       "--type",
       type,
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--deps-configs=$_rebased_deps_configs",
       "--build-config",
@@ skipping 214 matching lines @@
                              "deps",
                              "inputs",
                              "sources",
                              "testonly",
                              "visibility",
                            ])
     if (!defined(sources)) {
       sources = []
     }
     script = "//build/android/gyp/copy_ex.py"
+
     depfile = "$target_gen_dir/$target_name.d"
-
-    _stamp_file = "$target_gen_dir/$target_name.stamp"
     outputs = [
-      _stamp_file,
+      depfile,
     ]
 
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
-      "--stamp",
-      rebase_path(_stamp_file, root_build_dir),
       "--dest",
       rebase_path(invoker.dest, root_build_dir),
     ]
     rebased_sources = rebase_path(sources, root_build_dir)
     args += [ "--files=$rebased_sources" ]
 
     if (defined(invoker.clear_dir) && invoker.clear_dir) {
       args += [ "--clear" ]
     }
 
@@ skipping 195 matching lines @@
         ]
       }
       test_runner_args += [ "--fast-local-dev" ]
     }
     if (is_asan) {
       test_runner_args += [ "--tool=asan" ]
     }
 
     generated_script = "$root_build_dir/bin/run_${_test_name}"
     outputs = [
+      depfile,
       generated_script,
     ]
     data += [ generated_script ]
 
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
@@ skipping 46 matching lines @@
 
       script = "//build/android/gyp/lint.py"
       depfile = "$target_gen_dir/$target_name.d"
       inputs = [
         _platform_xml_path,
         _suppressions_file,
         invoker.android_manifest,
       ]
 
       outputs = [
+        depfile,
         _config_path,
         _result_path,
       ]
 
       args = [
         "--lint-path=$_rebased_lint_android_sdk_root/tools/lint",
         "--cache-dir",
         rebase_path(_cache_dir, root_build_dir),
         "--platform-xml-path",
         rebase_path(_platform_xml_path, root_build_dir),
@@ skipping 71 matching lines @@
             rebase_path(invoker.alternative_android_sdk_jar)
       } else {
         inputs += [ android_sdk_jar ]
         _rebased_android_sdk_jar = rebased_android_sdk_jar
       }
       if (defined(invoker.inputs)) {
         inputs += invoker.inputs
       }
       depfile = "${target_gen_dir}/${target_name}.d"
       outputs = [
+        depfile,
         _output_jar_path,
         "$_output_jar_path.dump",
         "$_output_jar_path.seeds",
         "$_output_jar_path.mapping",
         "$_output_jar_path.usage",
       ]
       args = [
         "--depfile",
         rebase_path(depfile, root_build_dir),
         "--proguard-path",
@@ skipping 32 matching lines @@
       _rebased_build_config = rebase_path(invoker.build_config, root_build_dir)
 
       inputs = [
         "//build/android/pylib/utils/findbugs.py",
         _exclusions_file,
         invoker.jar_path,
         invoker.build_config,
       ]
 
       outputs = [
+        depfile,
         _result_path,
       ]
 
       args = [
         "--depfile",
         rebase_path(depfile, root_build_dir),
         "--exclude",
         rebase_path(_exclusions_file, root_build_dir),
         "--auxclasspath-gyp",
         "@FileArg($_rebased_build_config:javac:classpath)",
@@ skipping 27 matching lines @@
     _script_name = invoker.script_name
 
     action(target_name) {
       script = "//build/android/gyp/create_java_binary_script.py"
       depfile = "$target_gen_dir/$_script_name.d"
       java_script = "$root_build_dir/bin/$_script_name"
       inputs = [
         _build_config,
       ]
       outputs = [
+        depfile,
         java_script,
       ]
       forward_variables_from(invoker, [ "deps" ])
       _rebased_build_config = rebase_path(_build_config, root_build_dir)
       args = [
         "--depfile",
         rebase_path(depfile, root_build_dir),
         "--output",
         rebase_path(java_script, root_build_dir),
         "--classpath=@FileArg($_rebased_build_config:deps_info:java:full_classpath)",
@@ skipping 40 matching lines @@
                                  "sources",
                                  "testonly",
                                ])
 
         script = "//build/android/gyp/main_dex_list.py"
         depfile = "$target_gen_dir/$target_name.d"
 
         main_dex_rules = "//build/android/main_dex_classes.flags"
 
         outputs = [
+          depfile,
           _main_dex_list_path,
         ]
 
         args = [
           "--depfile",
           rebase_path(depfile, root_build_dir),
           "--android-sdk-tools",
           rebased_android_sdk_build_tools,
           "--main-dex-list-path",
           rebase_path(_main_dex_list_path, root_build_dir),
@@ skipping 16 matching lines @@
       forward_variables_from(invoker,
                              [
                                "deps",
                                "inputs",
                                "sources",
                                "testonly",
                              ])
       script = "//build/android/gyp/dex.py"
       depfile = "$target_gen_dir/$target_name.d"
       outputs = [
+        depfile,
         invoker.output,
       ]
 
       rebased_output = rebase_path(invoker.output, root_build_dir)
 
       args = [
         "--depfile",
         rebase_path(depfile, root_build_dir),
         "--android-sdk-tools",
         rebased_android_sdk_build_tools,
@@ skipping 171 matching lines @@
       _source_dirs_listing_file = "$target_out_dir/${target_name}_sources.txt"
       _emma_jar = "${android_sdk_root}/tools/lib/emma.jar"
 
       script = "//build/android/gyp/emma_instr.py"
       depfile = "${target_gen_dir}/${target_name}.d"
       inputs = invoker.java_files + [
                  _emma_jar,
                  invoker.input_jar_path,
                ]
       outputs = [
+        depfile,
         _coverage_file,
         _source_dirs_listing_file,
         invoker.output_jar_path,
       ]
       args = [
         "instrument_jar",
         "--input-path",
         rebase_path(invoker.input_jar_path, root_build_dir),
         "--output-path",
         rebase_path(invoker.output_jar_path, root_build_dir),
@@ skipping 54 matching lines @@
       data_deps = [
         "//tools/android/md5sum",
       ]  # Used when deploying APKs
 
       inputs = invoker.native_libs + [ invoker.resource_packaged_apk_path ]
       if (defined(invoker.dex_path)) {
         inputs += [ invoker.dex_path ]
       }
 
       outputs = [
+        depfile,
         invoker.output_apk_path,
       ]
 
       _rebased_resource_packaged_apk_path =
           rebase_path(invoker.resource_packaged_apk_path, root_build_dir)
       _rebased_packaged_apk_path =
           rebase_path(invoker.output_apk_path, root_build_dir)
       args = [
         "--depfile",
         rebase_path(depfile, root_build_dir),
@@ skipping 76 matching lines @@
                                "testonly",
                              ])
 
       sources = [
         invoker.input_apk_path,
       ]
       inputs = [
         invoker.keystore_path,
       ]
       outputs = [
+        depfile,
         invoker.output_apk_path,
       ]
       data = [
         invoker.output_apk_path,
       ]
 
       args = [
         "--depfile",
         rebase_path(depfile, root_build_dir),
         "--zipalign-path",
@@ skipping 116 matching lines @@
 
         script = "//build/android/gyp/package_resources.py"
         depfile = "${target_gen_dir}/${target_name}.d"
         inputs = [
           invoker.android_manifest,
         ]
         if (defined(_resources_zip)) {
           inputs += [ _resources_zip ]
         }
         outputs = [
+          depfile,
           invoker.resource_packaged_apk_path,
         ]
 
         if (defined(invoker.android_aapt_path)) {
           _android_aapt_path = invoker.android_aapt_path
         } else {
           _android_aapt_path = android_default_aapt_path
         }
 
         if (defined(invoker.alternative_android_sdk_jar)) {
@@ skipping 74 matching lines @@
                        "target_gen_dir") + "/AndroidManifest.xml"
     action(_generate_incremental_manifest_target_name) {
       deps = _incremental_deps
       script =
           "//build/android/incremental_install/generate_android_manifest.py"
       depfile = "${target_gen_dir}/${target_name}.d"
       inputs = [
         _android_manifest,
       ]
       outputs = [
+        depfile,
         _incremental_android_manifest,
       ]
 
       _rebased_src_manifest = rebase_path(_android_manifest, root_build_dir)
       _rebased_incremental_manifest =
           rebase_path(_incremental_android_manifest, root_build_dir)
       _rebased_depfile = rebase_path(depfile, root_build_dir)
       args = [
         "--src-manifest=$_rebased_src_manifest",
         "--out-manifest=$_rebased_incremental_manifest",
@@ skipping 414 matching lines @@
 
     action(_javac_target_name) {
       script = "//build/android/gyp/javac.py"
       depfile = "$target_gen_dir/$target_name.d"
       deps = _srcjar_deps
       if (defined(invoker.deps)) {
         deps += invoker.deps
       }
 
       outputs = [
+        depfile,
         _javac_jar_path,
         _javac_jar_path + ".md5.stamp",
       ]
       sources = invoker.java_files + _java_srcjars
       inputs = [
         _build_config,
       ]
       if (invoker.java_files != []) {
         inputs += [ invoker.java_sources_file ]
       }
@@ skipping 423 matching lines @@
     action(target_name) {
       forward_variables_from(invoker,
                              [
                                "deps",
                                "visibility",
                              ])
       script = "//build/android/gyp/process_resources.py"
 
       depfile = "$target_gen_dir/$target_name.d"
       outputs = [
+        depfile,
         zip_path,
         srcjar_path,
         r_text_path,
       ]
 
       _all_resource_dirs = []
       sources = []
 
       if (defined(invoker.resource_dirs)) {
         _all_resource_dirs += invoker.resource_dirs
@@ skipping 181 matching lines @@
           invoker.has_code,
         ]
       }
       args += [
         "--depfile",
         rebase_path(depfile, root_build_dir),
       ]
 
       script = "//build/android/gyp/generate_split_manifest.py"
       outputs = [
+        depfile,
         invoker.out_manifest,
       ]
       inputs = [
         invoker.main_manifest,
       ]
     }
   }
 }