summaryrefslogtreecommitdiffstats
path: root/components/test
diff options
context:
space:
mode:
authoragrieve <agrieve@chromium.org>2015-06-22 12:01:54 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-22 19:02:29 +0000
commit1e54fed611ebeef569a3c452f744ed53ae341991 (patch)
tree57d13c075e5964f06a4a5afc0dddf538a0be369f /components/test
parent9823c58a39e0a2500f2e65c74952cdc887a97e56 (diff)
downloadchromium_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 'components/test')
-rw-r--r--components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsApplication.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsApplication.java b/components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsApplication.java
index d1b128e..a8387ce 100644
--- a/components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsApplication.java
+++ b/components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsApplication.java
@@ -26,7 +26,7 @@ public class ComponentsBrowserTestsApplication extends BaseChromiumApplication {
}
public static void initializeApplicationParameters(Context context) {
- ResourceExtractor.setMandatoryPaksToExtract(MANDATORY_PAK_FILES);
+ ResourceExtractor.setMandatoryPaksToExtract(0, MANDATORY_PAK_FILES);
PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX, context);
}
}