Fix handling of resources

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("//tools/grit/grit_rule.gni")
 
 assert(is_android)
 
@@ skipping 350 matching lines @@
 
   base_path = "$target_gen_dir/$target_name"
   zip_path = base_path + ".resources.zip"
   srcjar_path = base_path + ".srcjar"
   build_config = base_path + ".build_config"
 
   write_build_config("${target_name}__build_config") {
     type = "android_resources"
     resources_zip = zip_path
     srcjar = srcjar_path
-    if (defined(invoker.deps)) {
-      deps = invoker.deps
-    }
+    if (defined(invoker.deps)) { deps = invoker.deps }
+    if (defined(invoker.android_manifest)) { android_manifest = invoker.android_manifest }
+    if (defined(invoker.custom_package)) { custom_package = invoker.custom_package }
   }
 
   android_manifest = "//build/android/AndroidManifest.xml"
   if (defined(invoker.android_manifest)) {
     android_manifest = invoker.android_manifest
   }
 
   process_resources("${target_name}__process_resources") {
     resource_dirs = invoker.resource_dirs
     if (defined(invoker.custom_package)) {
@@ skipping 284 matching lines @@
 #       native_lib_path
 #     ]
 #   }
 template("android_apk") {
   assert(defined(invoker.final_apk_path) || defined(invoker.apk_name))
   gen_dir = "$target_gen_dir/$target_name"
   base_path = "$gen_dir/$target_name"
   build_config = "$base_path.build_config"
   resources_zip_path = "$base_path.resources.zip"
   all_resources_zip_path = "$base_path.resources.all.zip"
-  resource_srcjar_path = "$base_path.resources.srcjar"
   jar_path = "$base_path.jar"
   final_dex_path = "$gen_dir/classes.dex"
   _template_name = target_name
   _final_apk_path = ""
   if (defined(invoker.final_apk_path)) {
     _final_apk_path = invoker.final_apk_path
   } else if (defined(invoker.apk_name)) {
     _final_apk_path = "$root_build_dir/apks/" + invoker.apk_name + ".apk"
   }
   _dist_jar_path_list = process_file_template(
       [ _final_apk_path ],
       "$root_build_dir/test.lib.java/{{source_name_part}}.jar"
       )
   _dist_jar_path = _dist_jar_path_list[0]
 
   _native_libs = []
   if (defined(invoker.native_libs)) {
     _native_libs = invoker.native_libs
     _native_libs_dir = base_path + "/libs"
   }
 
-  _has_java = (
-      defined(invoker.java_files)
-      || defined(invoker.DEPRECATED_java_in_dir)
-      || _native_libs != []
-      )
-
   _keystore_path = android_default_keystore_path
   _keystore_name = android_default_keystore_name
   _keystore_password = android_default_keystore_password
 
   if (defined(invoker.keystore_path)) {
     _keystore_path = invoker.keystore_path
     _keystore_name = invoker.keystore_name
     _keystore_password = invoker.keystore_password
   }
 
   _srcjar_deps = []
   if (defined(invoker.srcjar_deps)) {
     _srcjar_deps += invoker.srcjar_deps
   }
 
   _rebased_build_config = rebase_path(build_config, root_build_dir)
 
   write_build_config("${_template_name}__build_config") {
     type = "android_apk"
-    srcjar = resource_srcjar_path
     dex_path = final_dex_path
     resources_zip = resources_zip_path
 
     if (defined(invoker.deps)) {
       deps = invoker.deps
     }
     if (defined(invoker.testonly)) {
       testonly = invoker.testonly
     }
 
     native_libs = _native_libs
   }
 
   final_deps = []
 
   final_deps += [":${_template_name}__process_resources"]
   process_resources("${_template_name}__process_resources") {
+    srcjar_path = "${target_gen_dir}/${target_name}.srcjar"
     android_manifest = invoker.android_manifest
-
     resource_dirs = ["//build/android/ant/empty/res"]
     zip_path = resources_zip_path
-    srcjar_path = resource_srcjar_path
-
     generate_constant_ids = true
   }
+  _srcjar_deps += [":${_template_name}__process_resources"]
 
   if (_native_libs != []) {
     _use_chromium_linker = false
     _enable_chromium_linker_tests = false
     _load_library_from_apk = false
     _native_lib_version_name = ""
 
 
     java_cpp_template("${_template_name}__native_libraries_java") {
       package_name = "org/chromium/base/library_loader"
@@ skipping 15 matching lines @@
       if (_load_library_from_apk) {
         defines += ["ENABLE_CHROMIUM_LINKER_LIBRARY_IN_ZIP_FILE"]
       }
       if (_enable_chromium_linker_tests) {
         defines += ["ENABLE_CHROMIUM_LINKER_TESTS"]
       }
     }
     _srcjar_deps += [ ":${_template_name}__native_libraries_java" ]
   }
 
-  if (_has_java) {
-    final_deps += [ ":${_template_name}__java" ]
-    android_java_library("${_template_name}__java") {
-      android_manifest = invoker.android_manifest
-      if (defined(invoker.java_files)) {
-        java_files = invoker.java_files
-      } else if (defined(invoker.DEPRECATED_java_in_dir)) {
-        DEPRECATED_java_in_dir = invoker.DEPRECATED_java_in_dir
-      } else {
-        assert(_srcjar_deps != [])
-        java_files = []
-      }
-      srcjar_deps = _srcjar_deps
-      dex_path = base_path + ".dex.jar"
+  final_deps += [ ":${_template_name}__java" ]
+  android_java_library("${_template_name}__java") {
+    android_manifest = invoker.android_manifest
+    if (defined(invoker.java_files)) {
+      java_files = invoker.java_files
+    } else if (defined(invoker.DEPRECATED_java_in_dir)) {
+      DEPRECATED_java_in_dir = invoker.DEPRECATED_java_in_dir
+    } else {
+      java_files = []
     }
-  } else {
-    assert(_srcjar_deps == [])
+    srcjar_deps = _srcjar_deps
+    dex_path = base_path + ".dex.jar"
   }
 
   if (_dist_jar_path != "") {
     # TODO(cjhopman): This is only ever needed to calculate the list of tests to
     # run. See build/android/pylib/instrumentation/test_jar.py. We should be
     # able to just do that calculation at build time instead.
     action("${_template_name}__create_dist_jar") {
       script = "//build/android/gyp/create_dist_jar.py"
       depfile = "$target_gen_dir/$target_name.d"
       inputs = [ build_config ]
       outputs = [
         depfile,
         _dist_jar_path,
       ]
       args = [
         "--depfile", rebase_path(depfile, root_build_dir),
         "--output", rebase_path(_dist_jar_path, root_build_dir),
         "--inputs=@FileArg($_rebased_build_config:dist_jar:dependency_jars)",
       ]
-      if (_has_java) {
-        inputs += [ jar_path ]
-        _rebased_jar_path = rebase_path([ jar_path ], root_build_dir)
-        args += [
-          "--inputs=$_rebased_jar_path",
-        ]
-      }
+      inputs += [ jar_path ]
+      _rebased_jar_path = rebase_path([ jar_path ], root_build_dir)
+      args += [
+        "--inputs=$_rebased_jar_path",
+      ]
     }
   }
 
   final_deps += [":${_template_name}__final_dex"]
   dex("${_template_name}__final_dex") {
-    sources = []
-    if (_has_java) {
-      deps = [ ":${_template_name}__java" ]
-      sources += [ jar_path ]
-    }
+    deps = [ ":${_template_name}__java" ]
+    sources = [ jar_path ]
     inputs = [ build_config ]
     output = final_dex_path
     dex_arg_key = "${_rebased_build_config}:apk_dex:dependency_dex_files"
     args = [ "--inputs=@FileArg($dex_arg_key)" ]
   }
 
   if (_native_libs != []) {
     copy_ex("${_template_name}__prepare_native") {
       clear_dir = true
       inputs = [
@@ skipping 233 matching lines @@
     args = [
       "--files=$rebased_binaries_list",
       "--files=@FileArg($rebased_libraries_list:libraries)",
     ]
   }
 
   group(target_name) {
     deps = final_deps
   }
 }