summaryrefslogtreecommitdiffstats
path: root/android_webview/test
diff options
context:
space:
mode:
authoragrieve <agrieve@chromium.org>2015-06-19 14:20:03 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-19 21:21:24 +0000
commitf30e04470453ccd7e6a9abf586185b991d174902 (patch)
tree6294dd378c05275f7f142c8665d3f83b455c4e84 /android_webview/test
parente33731cd7108536b56e18e722af5c9d425c47d55 (diff)
downloadchromium_src-f30e04470453ccd7e6a9abf586185b991d174902.zip
chromium_src-f30e04470453ccd7e6a9abf586185b991d174902.tar.gz
chromium_src-f30e04470453ccd7e6a9abf586185b991d174902.tar.bz2
Android: Store language .pak files in res/raw rather than assets
This is a prerequisite for having them live within APK splits. Although pak files need to be renamed to be stored under res/raw, ResourceExtractor restores their original name during extraction (so no change to native code). All sub-locales are stored and extracted together, just as before. BUG=371610 Review URL: https://codereview.chromium.org/1158053005 Cr-Commit-Position: refs/heads/master@{#335350}
Diffstat (limited to 'android_webview/test')
-rw-r--r--android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellApplication.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellApplication.java b/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellApplication.java
index 986785e..f6dc9a5 100644
--- a/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellApplication.java
+++ b/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellApplication.java
@@ -46,8 +46,7 @@ public class AwShellApplication extends ContentApplication {
@Override
protected void initializeLibraryDependencies() {
- ResourceExtractor.setMandatoryPaksToExtract("");
- ResourceExtractor.setExtractImplicitLocaleForTesting(false);
+ ResourceExtractor.setMandatoryPaksToExtract(0);
}
@Override