Index: chrome/android/java_staging/src/org/chromium/chrome/browser/ChromeMobileApplication.java |
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/ChromeMobileApplication.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/ChromeMobileApplication.java |
index 1b63cd9108b127b4eb79da1314c2741dab396fb4..a179531f7c80f481781711d3b72ad707c5bf98fb 100644 |
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/ChromeMobileApplication.java |
+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/ChromeMobileApplication.java |
@@ -19,6 +19,7 @@ import org.chromium.base.ApiCompatibilityUtils; |
import org.chromium.base.ApplicationState; |
import org.chromium.base.ApplicationStatus; |
import org.chromium.base.ApplicationStatus.ApplicationStateListener; |
+import org.chromium.base.BuildInfo; |
import org.chromium.base.PathUtils; |
import org.chromium.base.ResourceExtractor; |
import org.chromium.base.ThreadUtils; |
@@ -196,7 +197,9 @@ public class ChromeMobileApplication extends ChromiumApplication { |
// The ResourceExtractor is only needed by the browser process, but this will have no |
// impact on the renderer process construction. |
ResourceBundle.initializeLocalePaks(this, R.array.locale_paks); |
- ResourceExtractor.setMandatoryPaksToExtract(ResourceBundle.getActiveLocaleResources()); |
+ if (!BuildInfo.hasApkSplits(this)) { |
+ ResourceExtractor.setMandatoryPaksToExtract(ResourceBundle.getActiveLocaleResources()); |
+ } |
PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX, this); |
} |