Move ChromiumMultiDex to BuildConfig.

base/base.gyp

Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 3e02c604541186d8120ca91ae5a53ddd40072e91..155c42d572a459c9b8c65f5e609e587f8dc95d0e 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -1384,14 +1384,14 @@
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
         {
-          # GN: //base:base_multidex_gen
-          'target_name': 'base_multidex_gen',
+          # GN: //base:base_chromium_build_config_gen
+          'target_name': 'base_chromium_build_config_gen',
           'type': 'none',
           'sources': [
-            'android/java/templates/ChromiumMultiDex.template',
+            'android/java/templates/ChromiumBuildConfig.template',
           ],
           'variables': {
-            'package_name': 'org/chromium/base/multidex',
+            'package_name': 'org/chromium/base',
             'template_deps': [],
           },
           'includes': ['../build/android/java_cpp_template.gypi'],
@@ -1412,7 +1412,7 @@
           'variables': {
             'java_in_dir': 'android/java',
             'jar_excluded_classes': [
-              '*/ChromiumMultiDex.class',
+              '*/ChromiumBuildConfig.class',
               '*/NativeLibraries.class',
             ],
           },
@@ -1421,14 +1421,14 @@
             'base_java_library_load_from_apk_status_codes',
             'base_java_library_process_type',
             'base_java_memory_pressure_level',
-            'base_multidex_gen',
+            'base_chromium_build_config_gen',
             'base_native_libraries_gen',
             '../third_party/android_tools/android_tools.gyp:android_support_multidex_javalib',
             '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
           ],
           'all_dependent_settings': {
             'variables': {
-              'generate_multidex_config': 1,
+              'generate_chromium_build_config': 1,
             },
           },
           'includes': [ '../build/java.gypi' ],
@@ -1492,7 +1492,7 @@
           'target_name': 'base_junit_test_support',
           'type': 'none',
           'dependencies': [
-            'base_multidex_gen',
+            'base_chromium_build_config_gen',
             '../testing/android/junit/junit_test.gyp:junit_test_support',
             '../third_party/android_tools/android_tools.gyp:android_support_multidex_javalib',
           ],