Move ChromiumMultiDex to BuildConfig.

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("//base/android/linker/config.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/toolchain/toolchain.gni")
 import("//third_party/android_platform/config.gni")
@@ skipping 1467 matching lines @@
         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 (!defined(invoker.apk_under_test)) {
     java_cpp_template("${_template_name}__multidex_config_java") {

[jbudorick, 2016/01/21 01:51:15]

This name should change.

[Peter Wen, 2016/01/21 15:18:24]

Done. Also switched this to always build, even under test.

-      package_name = "org/chromium/base/multidex"
+      package_name = "org/chromium/base"
       sources = [
-        "//base/android/java/templates/ChromiumMultiDex.template",
+        "//base/android/java/templates/ChromiumBuildConfig.template",
       ]
 
       defines = []
       if (enable_multidex) {
         defines += [ "ENABLE_MULTIDEX" ]
       }
     }
     _srcjar_deps += [ ":${_template_name}__multidex_config_java" ]
   }
 
@@ skipping 772 matching lines @@
   }
 
   android_library(target_name) {
     java_files = []
     srcjar_deps = [ ":${_template_name}__protoc_java" ]
     deps = [
       "//third_party/android_protobuf:protobuf_nano_javalib",
     ]
   }
 }