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

build/config/android/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/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/config/dcheck_always_on.gni")
 import("//build/toolchain/toolchain.gni")
 
 assert(is_android)
@@ skipping 31 matching lines @@
   action(_find_deps_target_name) {
     forward_variables_from(invoker, [ "deps" ])
 
     script = "//build/android/gyp/write_ordered_libraries.py"
     depfile = "$target_gen_dir/$target_name.d"
     inputs = [
       invoker.binary,
       android_readelf,
     ]
     outputs = [
+      depfile,
       _libraries_list,
     ]
     rebased_binaries = rebase_path([ invoker.binary ], root_build_dir)
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--input-libraries=$rebased_binaries",
       "--libraries-dir",
       rebase_path(root_shlib_dir, root_build_dir),
       "--output",
@@ skipping 114 matching lines @@
 
     jni_generator_include =
         "//base/android/jni_generator/jni_generator_helper.h"
 
     foreach_target_name = "${target_name}__jni_gen"
     action_foreach(foreach_target_name) {
       script = "//base/android/jni_generator/jni_generator.py"
       depfile = "$target_gen_dir/$target_name.{{source_name_part}}.d"
       sources = invoker.sources
       outputs = [
+        depfile,
         "${jni_output_dir}/{{source_name_part}}_jni.h",
       ]
 
       args = [
         "--depfile",
         rebase_path(depfile, root_build_dir),
         "--input_file={{source}}",
         "--optimize_generation=1",
         "--ptr_type=long",
         "--output_dir",
@@ skipping 83 matching lines @@
       jni_actions += [ ":$jni_target_name" ]
       action(jni_target_name) {
         # The sources aren't compiled so don't check their dependencies.
         check_includes = false
         depfile = "$target_gen_dir/$target_name.d"
         script = "//base/android/jni_generator/jni_generator.py"
         sources = [
           jar_file,
         ]
         outputs = [
+          depfile,
           "${jni_output_dir}/${classname}_jni.h",
         ]
 
         args = [
           "--depfile",
           rebase_path(depfile, root_build_dir),
           "--jar_file",
           rebase_path(jar_file, root_build_dir),
           "--input_file",
           class,
@@ skipping 82 matching lines @@
       script = "//build/android/gyp/gcc_preprocess.py"
       if (defined(invoker.inputs)) {
         inputs = invoker.inputs + []
       }
       depfile =
           "${target_gen_dir}/${invoker.target_name}_{{source_name_part}}.d"
 
       sources = invoker.sources
 
       outputs = [
+        depfile,
         "$_base_gen_dir/${invoker.package_name}/{{source_name_part}}.java",
       ]
 
       args = [
         "--depfile",
         rebase_path(depfile, root_build_dir),
         "--include-path",
         rebase_path(_include_path, root_build_dir),
         "--output",
-        rebase_path(outputs[0], root_build_dir),
+        rebase_path(outputs[1], root_build_dir),
         "--template={{source}}",
       ]
 
       if (defined(invoker.defines)) {
         foreach(def, invoker.defines) {
           args += [
             "--defines",
             def,
           ]
         }
@@ skipping 54 matching lines @@
       _srcjar_path = "${target_gen_dir}/${target_name}.srcjar"
       _rebased_srcjar_path = rebase_path(_srcjar_path, root_build_dir)
       _rebased_sources = rebase_path(invoker.sources, root_build_dir)
 
       args = [
                "--depfile",
                rebase_path(depfile, root_build_dir),
                "--srcjar=$_rebased_srcjar_path",
              ] + _rebased_sources
       outputs = [
+        depfile,
         _srcjar_path,
       ]
     }
   }
 
   # Declare a target for processing a Jinja template.
   #
   # Variables
   #   input: The template file to be processed.
   #   output: Where to save the result.
@@ skipping 19 matching lines @@
                                "deps",
                              ])
 
       sources = [
         invoker.input,
       ]
       script = "//build/android/gyp/jinja_template.py"
       depfile = "$target_gen_dir/$target_name.d"
 
       outputs = [
+        depfile,
         invoker.output,
       ]
 
       args = [
         "--loader-base-dir",
         rebase_path("//", root_build_dir),
         "--inputs",
         rebase_path(invoker.input, root_build_dir),
         "--output",
         rebase_path(invoker.output, root_build_dir),
@@ skipping 44 matching lines @@
       resources_zip = _resources_zip
       type = "android_resources"
     }
 
     action("${target_name}__template") {
       sources = invoker.resources
       script = "//build/android/gyp/jinja_template.py"
       depfile = "$target_gen_dir/$target_name.d"
 
       outputs = [
+        depfile,
         _resources_zip,
       ]
 
       rebased_resources = rebase_path(invoker.resources, root_build_dir)
       args = [
         "--inputs=${rebased_resources}",
         "--inputs-base-dir",
         rebase_path(invoker.res_dir, root_build_dir),
         "--outputs-zip",
         rebase_path(_resources_zip, root_build_dir),
@@ skipping 49 matching lines @@
     action("${target_name}__create_resources_zip") {
       forward_variables_from(invoker,
                              [
                                "deps",
                                "sources",
                              ])
       script = "//build/android/gyp/locale_pak_resources.py"
       depfile = "$target_gen_dir/$target_name.d"
 
       outputs = [
+        depfile,
         _resources_zip,
       ]
 
       _rebased_sources = rebase_path(sources, root_build_dir)
       args = [
         "--locale-paks=${_rebased_sources}",
         "--resources-zip",
         rebase_path(_resources_zip, root_build_dir),
         "--depfile",
         rebase_path(depfile, root_build_dir),
@@ skipping 1150 matching lines @@
     if (defined(invoker.create_dist_ijar) && invoker.create_dist_ijar) {
       _dist_ijar_path = "$root_build_dir/test.lib.java/" +
                         get_path_info(_final_apk_path, "name") + ".jar"
       action("${_template_name}_dist_ijar") {
         script = "//build/android/gyp/create_dist_jar.py"
         depfile = "$target_gen_dir/$target_name.d"
         inputs = [
           _build_config,
         ]
         outputs = [
+          depfile,
           "${_dist_ijar_path}",
         ]
         data = [
           _dist_ijar_path,
         ]
         args = [
           "--depfile",
           rebase_path(depfile, root_build_dir),
           "--output",
           rebase_path("${_dist_ijar_path}", root_build_dir),
@@ skipping 109 matching lines @@
 
       action(_prepare_native_target_name) {
         forward_variables_from(invoker,
                                [
                                  "deps",
                                  "public_deps",
                                ])
         script = "//build/android/gyp/pack_relocations.py"
         depfile = "$target_gen_dir/$target_name.d"
         outputs = [
+          depfile,
           _native_libs_json,
         ]
 
         inputs = [
           _build_config,
         ]
 
         deps += _native_libs_deps
         deps += [
           ":$build_config_target",
@@ skipping 170 matching lines @@
     _create_incremental_script_rule_name =
         "${_template_name}__incremental_script"
     action(_create_incremental_script_rule_name) {
       script = "//build/android/incremental_install/create_install_script.py"
       depfile = "$target_gen_dir/$target_name.d"
       deps = [
         _native_libs_file_arg_dep,
       ]
 
       outputs = [
+        depfile,
         _incremental_install_script_path,
       ]
 
       _rebased_apk_path_no_ext =
           rebase_path(_final_apk_path_no_ext, root_build_dir)
       _rebased_incremental_install_script_path =
           rebase_path(_incremental_install_script_path, root_build_dir)
       _rebased_depfile = rebase_path(depfile, root_build_dir)
       _dex_arg_key = "${_rebased_build_config}:final_dex:dependency_dex_files"
       args = [
@@ skipping 336 matching lines @@
       imports = [ framework_aidl ]
       if (defined(invoker.interface_file)) {
         assert(invoker.interface_file != "")
         imports += [ invoker.interface_file ]
       }
 
       inputs = [ aidl_path ] + imports
 
       depfile = "${target_gen_dir}/${target_name}.d"
       outputs = [
+        depfile,
         srcjar_path,
       ]
       rebased_imports = rebase_path(imports, root_build_dir)
       args = [
         "--depfile",
         rebase_path(depfile, root_build_dir),
         "--aidl-path",
         rebase_path(aidl_path, root_build_dir),
         "--imports=$rebased_imports",
         "--srcjar",
@@ skipping 50 matching lines @@
       deps = [
         _protoc_dep,
       ]
       if (defined(invoker.deps)) {
         deps += invoker.deps
       }
 
       sources = invoker.sources
       depfile = "$target_gen_dir/$target_name.d"
       outputs = [
+        depfile,
         srcjar_path,
       ]
       args = [
                "--depfile",
                rebase_path(depfile, root_build_dir),
                "--protoc",
                rebase_path(_protoc_bin, root_build_dir),
                "--proto-path",
                rebase_path(_proto_path, root_build_dir),
                "--srcjar",
@@ skipping 121 matching lines @@
         supports_android = true
         jar_path = "${_output_path}/$jar"
       }
     }
 
     java_group(target_name) {
       deps = _resource_targets + _jar_targets
     }
   }
 }