Move ChromiumMultiDex to BuildConfig.

base/base.gyp

Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 94a1d49258572d0833fca927e599874541efca0f..9ad1a8fb89afe7405a5aa69012d5bbc654fb45ca 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -1480,14 +1480,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'],
@@ -1508,7 +1508,7 @@
           'variables': {
             'java_in_dir': 'android/java',
             'jar_excluded_classes': [
-              '*/ChromiumMultiDex.class',
+              '*/ChromiumBuildConfig.class',
               '*/NativeLibraries.class',
             ],
           },
@@ -1517,7 +1517,7 @@
             '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',
@@ -1588,7 +1588,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',
           ],