Commit 6b3d57c3 authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Android: BuildConfig.isMultidexEnabled() -> BuildConfig.IS_MULTIDEX_ENABLED

Allows for better inlining by ProGuard.

TBR=agrieve  # Simple rename

Change-Id: If0b57507aeae938bdbe2adbd62e5d38c0d50ab4c
Reviewed-on: https://chromium-review.googlesource.com/964383Reviewed-by: default avataragrieve <agrieve@chromium.org>
Reviewed-by: default avatarEric Stevenson <estevenson@chromium.org>
Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Commit-Queue: agrieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543451}
parent 230e2aa8
...@@ -18,18 +18,11 @@ package org.chromium.base; ...@@ -18,18 +18,11 @@ package org.chromium.base;
*/ */
public class BuildConfig { 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.
*/
public static boolean isMultidexEnabled() {
#if defined(ENABLE_MULTIDEX) #if defined(ENABLE_MULTIDEX)
return true; public static MAYBE_FINAL boolean IS_MULTIDEX_ENABLED = true;
#else #else
return false; public static MAYBE_FINAL boolean IS_MULTIDEX_ENABLED = false;
#endif #endif
}
#if defined(_FIREBASE_APP_ID) #if defined(_FIREBASE_APP_ID)
public static MAYBE_FINAL String FIREBASE_APP_ID = QUOTE(_FIREBASE_APP_ID); public static MAYBE_FINAL String FIREBASE_APP_ID = QUOTE(_FIREBASE_APP_ID);
......
...@@ -60,7 +60,7 @@ public class ChromeApplication extends Application { ...@@ -60,7 +60,7 @@ public class ChromeApplication extends Application {
UmaUtils.recordMainEntryPointTime(); UmaUtils.recordMainEntryPointTime();
super.attachBaseContext(context); super.attachBaseContext(context);
checkAppBeingReplaced(); checkAppBeingReplaced();
if (BuildConfig.isMultidexEnabled()) { if (BuildConfig.IS_MULTIDEX_ENABLED) {
ChromiumMultiDexInstaller.install(this); ChromiumMultiDexInstaller.install(this);
} }
ContextUtils.initApplicationContext(this); ContextUtils.initApplicationContext(this);
......
...@@ -22,7 +22,7 @@ public class ComponentsBrowserTestsApplication extends Application { ...@@ -22,7 +22,7 @@ public class ComponentsBrowserTestsApplication extends Application {
@Override @Override
protected void attachBaseContext(Context base) { protected void attachBaseContext(Context base) {
super.attachBaseContext(base); super.attachBaseContext(base);
if (BuildConfig.isMultidexEnabled()) { if (BuildConfig.IS_MULTIDEX_ENABLED) {
ChromiumMultiDexInstaller.install(this); ChromiumMultiDexInstaller.install(this);
} }
ContextUtils.initApplicationContext(this); ContextUtils.initApplicationContext(this);
......
...@@ -22,7 +22,7 @@ public class ContentBrowserTestsApplication extends Application { ...@@ -22,7 +22,7 @@ public class ContentBrowserTestsApplication extends Application {
@Override @Override
protected void attachBaseContext(Context base) { protected void attachBaseContext(Context base) {
super.attachBaseContext(base); super.attachBaseContext(base);
if (BuildConfig.isMultidexEnabled()) { if (BuildConfig.IS_MULTIDEX_ENABLED) {
ChromiumMultiDexInstaller.install(this); ChromiumMultiDexInstaller.install(this);
} }
ContextUtils.initApplicationContext(this); ContextUtils.initApplicationContext(this);
...@@ -34,4 +34,4 @@ public class ContentBrowserTestsApplication extends Application { ...@@ -34,4 +34,4 @@ public class ContentBrowserTestsApplication extends Application {
PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX); PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX);
ApplicationStatus.initialize(this); ApplicationStatus.initialize(this);
} }
} }
\ No newline at end of file
...@@ -21,7 +21,7 @@ public class ChromiumLinkerTestApplication extends Application { ...@@ -21,7 +21,7 @@ public class ChromiumLinkerTestApplication extends Application {
@Override @Override
protected void attachBaseContext(Context base) { protected void attachBaseContext(Context base) {
super.attachBaseContext(base); super.attachBaseContext(base);
if (BuildConfig.isMultidexEnabled()) { if (BuildConfig.IS_MULTIDEX_ENABLED) {
ChromiumMultiDexInstaller.install(this); ChromiumMultiDexInstaller.install(this);
} }
ContextUtils.initApplicationContext(this); ContextUtils.initApplicationContext(this);
......
...@@ -25,7 +25,7 @@ public class ContentShellApplication extends Application { ...@@ -25,7 +25,7 @@ public class ContentShellApplication extends Application {
@Override @Override
protected void attachBaseContext(Context base) { protected void attachBaseContext(Context base) {
super.attachBaseContext(base); super.attachBaseContext(base);
if (BuildConfig.isMultidexEnabled()) { if (BuildConfig.IS_MULTIDEX_ENABLED) {
ChromiumMultiDexInstaller.install(this); ChromiumMultiDexInstaller.install(this);
} }
ContextUtils.initApplicationContext(this); ContextUtils.initApplicationContext(this);
......
...@@ -18,7 +18,7 @@ public class NativeTestApplication extends Application { ...@@ -18,7 +18,7 @@ public class NativeTestApplication extends Application {
protected void attachBaseContext(Context base) { protected void attachBaseContext(Context base) {
super.attachBaseContext(base); super.attachBaseContext(base);
assert getBaseContext() != null; assert getBaseContext() != null;
if (BuildConfig.isMultidexEnabled()) { if (BuildConfig.IS_MULTIDEX_ENABLED) {
ChromiumMultiDexInstaller.install(this); ChromiumMultiDexInstaller.install(this);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment