diff options
author | agrieve <agrieve@chromium.org> | 2015-06-22 12:01:54 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-06-22 19:02:29 +0000 |
commit | 1e54fed611ebeef569a3c452f744ed53ae341991 (patch) | |
tree | 57d13c075e5964f06a4a5afc0dddf538a0be369f /android_webview/glue | |
parent | 9823c58a39e0a2500f2e65c74952cdc887a97e56 (diff) | |
download | chromium_src-1e54fed611ebeef569a3c452f744ed53ae341991.zip chromium_src-1e54fed611ebeef569a3c452f744ed53ae341991.tar.gz chromium_src-1e54fed611ebeef569a3c452f744ed53ae341991.tar.bz2 |
Revert "Revert "Android: Store language .pak files in res/raw rather than assets""
This reverts commit bd0057ca4ca5990173e099f5cdd5219c6ed72fd5.
Also adds a "setMandatoryPaksToExtract" overload to prevent breakage.
BUG=371610
TBR=Yaron, Torne, cjhopman, Jaekyun Seok, James Hawkins, gunsch, newt
Review URL: https://codereview.chromium.org/1198193006
Cr-Commit-Position: refs/heads/master@{#335538}
Diffstat (limited to 'android_webview/glue')
-rw-r--r-- | android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java index 5ef433e..96ca680 100644 --- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java +++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java @@ -232,7 +232,7 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { // We don't need to extract any paks because for WebView, they are // in the system image. - ResourceExtractor.setMandatoryPaksToExtract(""); + ResourceExtractor.setMandatoryPaksToExtract(0); try { LibraryLoader.get(LibraryProcessType.PROCESS_WEBVIEW).ensureInitialized(); |