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

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.
 
 # Do not add any imports to non-//build directories here.
 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/dcheck_always_on.gni")
@@ skipping 1707 matching lines @@
       resources_zip = resources_zip_path
       build_config = _build_config
       android_manifest = _android_manifest
 
       if (defined(_java_sources_file)) {
         java_sources_file = _java_sources_file
       }
 
       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.
       if (emma_coverage && !_emma_never_instrument) {
         possible_config_deps +=
             [ "//third_party/android_tools:emma_device_java" ]
       }
 
       proguard_enabled = _proguard_enabled
       if (_proguard_enabled) {
@@ skipping 115 matching lines @@
       java_cpp_template("${_template_name}__build_config_java") {
         package_path = "org/chromium/base"
         sources = [
           "//base/android/java/templates/BuildConfig.template",
         ]
         deps = [
           ":$build_config_target",
         ]
 
         defines = []
-        if (enable_multidex) {
-          defines += [ "ENABLE_MULTIDEX" ]
-        }
         if (is_java_debug || dcheck_always_on) {
           defines += [ "_DCHECK_IS_ON" ]
         }
         defines += [
           "COMPRESSED_LOCALE_LIST=" +
               "@FileArg($_rebased_build_config:compressed_locales_java_list)",
           "UNCOMPRESSED_LOCALE_LIST=" +
               "@FileArg($_rebased_build_config:uncompressed_locales_java_list)",
         ]
       }
       _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,
                              [
                                "chromium_code",
                                "java_files",
                                "run_findbugs_override",
                              ])
       supports_android = true
       requires_android = true
@@ skipping 1011 matching lines @@
         # because in practice they seem to contain classes required to be in the
         # classpath.
         deps += _subjar_targets
       }
       if (defined(_res_target_name)) {
         deps += [ ":$_res_target_name" ]
       }
     }
   }
 }