Fix handling of resources

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)
@@ skipping 56 matching lines @@
   assert(defined(invoker.build_config))
 
   type = invoker.type
   build_config = invoker.build_config
 
   assert(type == "android_apk" || type == "android_library" || type == "android_resources")
 
   action(target_name) {
     script = "//build/android/gyp/write_build_config.py"
     depfile = "$target_gen_dir/$target_name.d"
+    inputs = []
 
     deps = []
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
     if (defined(invoker.testonly)) {
       testonly = invoker.testonly
     }
 
     outputs = [
@@ skipping 21 matching lines @@
         "--jar-path", rebase_path(invoker.jar_path, root_build_dir),
         "--dex-path", rebase_path(invoker.dex_path, root_build_dir),
       ]
     }
 
     if (type == "android_resources" || type == "android_apk") {
       assert(defined(invoker.resources_zip))
       args += [
         "--resources-zip", rebase_path(invoker.resources_zip, root_build_dir),
       ]
+      if (defined(invoker.android_manifest)) {
+        inputs += [
+          invoker.android_manifest
+        ]
+        args += [
+          "--android-manifest", rebase_path(invoker.android_manifest, root_build_dir),
+        ]
+      }
+      if (defined(invoker.custom_package)) {
+        args += [
+          "--package-name", invoker.custom_package
+        ]
+      }
     }
 
     if (type == "android_apk") {
       if (defined(invoker.native_libs)) {
         rebased_native_libs = rebase_path(invoker.native_libs, root_build_dir)
         rebased_android_readelf = rebase_path(android_readelf, root_build_dir)
         args += [
           "--native-libs=$rebased_native_libs",
           "--readelf-path=$rebased_android_readelf",
         ]
@@ skipping 508 matching lines @@
       "--depfile", rebase_path(depfile, root_build_dir),
       "--android-sdk", rebase_path(android_sdk, root_build_dir),
       "--android-sdk-tools", rebase_path(android_sdk_build_tools, root_build_dir),
       "--android-manifest", rebase_path(android_manifest, root_build_dir),
 
       "--resource-dirs=$rebase_resource_dirs",
       "--srcjar-out", rebase_path(srcjar_path, root_build_dir),
       "--resource-zip-out", rebase_path(zip_path, root_build_dir),
 
       "--dependencies-res-zips=@FileArg($rebase_build_config:resources:dependency_zips)",
+      "--extra-res-packages=@FileArg($rebase_build_config:resources:extra_package_names)",
     ]
 
     if (non_constant_id) {
       args += [ "--non-constant-id" ]
     }
 
     if (defined(invoker.custom_package)) {
       args += [
         "--custom-package", invoker.custom_package,
       ]
@@ skipping 35 matching lines @@
       "--dest", rebase_path(invoker.dest, root_build_dir),
     ]
     if (defined(invoker.args)) {
       args += invoker.args
     }
     if (defined(invoker.clear_dir) && invoker.clear_dir) {
       args += ["--clear"]
     }
   }
 }