Fixes for GN Android build inputs/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/config/android/config.gni")
 
 assert(is_android)
 
 rebased_android_sdk = rebase_path(android_sdk, root_build_dir)
 rebased_android_sdk_root = rebase_path(android_sdk_root, root_build_dir)
@@ skipping 650 matching lines @@
   }
 
   package_target = "${target_name}__package"
   action(package_target) {
     script = "//build/android/gyp/ant.py"
     _ant_script = "//build/android/ant/apk-package.xml"
 
     deps = [
       ":${_package_resources_target_name}",
     ]
+    if (defined(invoker.deps)) {
+      deps += invoker.deps
+    }
     depfile = "$target_gen_dir/$target_name.d"
 
     inputs = [
       _resource_packaged_apk_path,
       _ant_script,
     ]
     if (defined(_dex_path)) {
       inputs += [ _dex_path ]
     }
 
@@ skipping 557 matching lines @@
       outputs += [ all_resources_zip ]
       args += [
         "--all-resources-zip-out",
         rebase_path(all_resources_zip, root_build_dir),
       ]
     }
 
     if (defined(invoker.args)) {
       args += invoker.args
     }
+    if (defined(invoker.deps)) {
+      deps = invoker.deps
+    }
   }
 }
 
 template("copy_ex") {
   set_sources_assignment_filter([])
   if (defined(invoker.testonly)) {
     testonly = invoker.testonly
   }
 
   action(target_name) {
@@ skipping 106 matching lines @@
     script = "//build/android/gyp/generate_split_manifest.py"
     outputs = [
       depfile,
       invoker.out_manifest,
     ]
     inputs = [
       invoker.main_manifest,
     ]
   }
 }