Also adds debug build flag.

BUG=583690

Review URL: https://codereview.chromium.org/1597273005

Cr-Commit-Position: refs/heads/master@{#375666}

4 files changed, 28 insertions, 21 deletions

diff --git a/base/BUILD.gn b/base/BUILD.gn
index ce80891..f6e2e72 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1991,7 +1991,7 @@ if (is_android) {
   android_library("base_java") {
     srcjar_deps = [
       ":base_android_java_enums_srcjar",
-      ":base_multidex_gen",
+      ":base_build_config_gen",
       ":base_native_libraries_gen",
     ]
 
@@ -2002,10 +2002,10 @@ if (is_android) {
 
     DEPRECATED_java_in_dir = "android/java/src"
 
-    # New versions of ChromiumMultiDex.java and NativeLibraries.java
+    # New versions of BuildConfig.java and NativeLibraries.java
     # (with the actual correct values) will be created when creating an apk.
     jar_excluded_patterns = [
-      "*/ChromiumMultiDex.class",
+      "*/BuildConfig.class",
       "*/NativeLibraries.class",
       "*/NativeLibraries##*.class",
     ]
@@ -2040,7 +2040,7 @@ if (is_android) {
       "//third_party/robolectric:android-all-4.3_r2-robolectric-0",
       "//third_party/robolectric:robolectric_java",
     ]
-    srcjar_deps = [ ":base_multidex_gen" ]
+    srcjar_deps = [ ":base_build_config_gen" ]
   }
 
   # GYP: //base.gyp:base_junit_tests
@@ -2070,12 +2070,12 @@ if (is_android) {
     ]
   }
 
-  # GYP: //base/base.gyp:base_multidex_gen
-  java_cpp_template("base_multidex_gen") {
+  # GYP: //base/base.gyp:base_build_config_gen
+  java_cpp_template("base_build_config_gen") {
     sources = [
-      "android/java/templates/ChromiumMultiDex.template",
+      "android/java/templates/BuildConfig.template",
     ]
-    package_name = "org/chromium/base/multidex"
+    package_name = "org/chromium/base"
   }
 
   # GYP: //base/base.gyp:base_native_libraries_gen
diff --git a/base/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java b/base/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java
index e4b30b9..3d036c2 100644
--- a/base/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java
+++ b/base/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java
@@ -12,6 +12,7 @@ import android.content.pm.PackageManager;
 import android.os.Build;
 import android.support.multidex.MultiDex;
 
+import org.chromium.base.BuildConfig;
 import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 
@@ -47,7 +48,7 @@ public class ChromiumMultiDexInstaller {
      */
     @VisibleForTesting
     public static void install(Context context) {
-        if (!ChromiumMultiDex.isMultidexEnabled()) return;
+        if (!BuildConfig.isMultidexEnabled()) return;
 
         // TODO(jbudorick): Back out this version check once support for K & below works.
         // http://crbug.com/512357
diff --git a/base/android/java/templates/ChromiumMultiDex.template b/base/android/java/templates/BuildConfig.template
index 7e70701..d43a201 100644
--- a/base/android/java/templates/ChromiumMultiDex.template
+++ b/base/android/java/templates/BuildConfig.template
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.base.multidex;
+package org.chromium.base;
 
 /**
- *  Multidex configuration. Generated on a per-target basis.
+ *  Build configuration. Generated on a per-target basis.
  */
-class ChromiumMultiDex {
+public class BuildConfig {
 
     /** Whether multidex is enabled for this target.
      *
      *  This has to be a function instead of a static final boolean s.t. the initial false value
      *  doesn't get optimized into {@link ChromiumMultiDexInstaller} at base_java compile time.
      */
-    static boolean isMultidexEnabled() {
+    public static boolean isMultidexEnabled() {
 #if defined(ENABLE_MULTIDEX)
         return true;
 #else
@@ -22,4 +22,10 @@ class ChromiumMultiDex {
 #endif
     }
 
+#if defined(NDEBUG)
+    public static boolean sIsDebug = true;
+#else
+    public static boolean sIsDebug = false;
+#endif
+
 }
diff --git a/base/base.gyp b/base/base.gyp
index 328e31f..38cb811 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -1415,14 +1415,14 @@
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
         {
-          # GN: //base:base_multidex_gen
-          'target_name': 'base_multidex_gen',
+          # GN: //base:base_build_config_gen
+          'target_name': 'base_build_config_gen',
           'type': 'none',
           'sources': [
-            'android/java/templates/ChromiumMultiDex.template',
+            'android/java/templates/BuildConfig.template',
           ],
           'variables': {
-            'package_name': 'org/chromium/base/multidex',
+            'package_name': 'org/chromium/base',
             'template_deps': [],
           },
           'includes': ['../build/android/java_cpp_template.gypi'],
@@ -1443,7 +1443,7 @@
           'variables': {
             'java_in_dir': 'android/java',
             'jar_excluded_classes': [
-              '*/ChromiumMultiDex.class',
+              '*/BuildConfig.class',
               '*/NativeLibraries.class',
             ],
           },
@@ -1452,14 +1452,14 @@
             'base_java_library_load_from_apk_status_codes',
             'base_java_library_process_type',
             'base_java_memory_pressure_level',
-            'base_multidex_gen',
+            'base_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_build_config': 1,
             },
           },
           'includes': [ '../build/java.gypi' ],
@@ -1523,7 +1523,7 @@
           'target_name': 'base_junit_test_support',
           'type': 'none',
           'dependencies': [
-            'base_multidex_gen',
+            'base_build_config_gen',
             '../testing/android/junit/junit_test.gyp:junit_test_support',
             '../third_party/android_tools/android_tools.gyp:android_support_multidex_javalib',
           ],