ABANDONED [android] Create per-package configuration for multidex.

build/config/android/rules.gni

Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 44557326485d3d719806bbe4db0b8eb6c047e2d2..2e6f4b04e2e8a8240fa178ff9c429917c3cb70c7 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1725,8 +1725,9 @@ if (enable_java_templates) {
 
       deps = _android_manifest_deps
 
+      possible_config_deps = []
       if (defined(invoker.deps)) {
-        possible_config_deps = invoker.deps
+        possible_config_deps += invoker.deps
       }
 
       # Added emma to the target's classpath via its .build_config.
@@ -1862,9 +1863,6 @@ if (enable_java_templates) {
         ]
 
         defines = []
-        if (enable_multidex) {
-          defines += [ "ENABLE_MULTIDEX" ]
-        }
         if (is_java_debug || dcheck_always_on) {
           defines += [ "_DCHECK_IS_ON" ]
         }
@@ -1878,6 +1876,22 @@ if (enable_java_templates) {
       _srcjar_deps += [ ":${_template_name}__build_config_java" ]
     }
 
+    java_cpp_template("${_template_name}__package_config_java") {
+      package_path = "dynamic"
+      sources = [
+        "//base/android/java/templates/PackageConfig.template",
+      ]
+      deps = [
+        ":$build_config_target",
+      ]
+      defines =
+          [ "PACKAGE=@FileArg($_rebased_build_config:deps_info:package_name)" ]
+      if (enable_multidex) {
+        defines += [ "ENABLE_MULTIDEX" ]
+      }
+    }
+    _srcjar_deps += [ ":${_template_name}__package_config_java" ]
+
     java_target = "${_template_name}__java"
     java_library_impl(java_target) {
       forward_variables_from(invoker,