diff options
author | benm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 17:37:35 +0000 |
---|---|---|
committer | benm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 17:37:35 +0000 |
commit | 17237f16eb340cabca2df6d39ea83a9167ffc3c3 (patch) | |
tree | d5a402f21cb659b2564a922b46f22da54c802188 /android_webview/javatests | |
parent | 199af65ee52e4e9893df4c43dcf27663a2366efd (diff) | |
download | chromium_src-17237f16eb340cabca2df6d39ea83a9167ffc3c3.zip chromium_src-17237f16eb340cabca2df6d39ea83a9167ffc3c3.tar.gz chromium_src-17237f16eb340cabca2df6d39ea83a9167ffc3c3.tar.bz2 |
[Android WebView] Add new chrome/-less pak dependency.
android_webview must not depend on the chrome/ layer, so
we want to remove the last dependencies we have for generating resource paks. Toward this, define a new android_webview pak that depends only on content/ resources.
A later change will remove the dependency on the paks that contain chrome/resources.
For now we use the same resources Content Shell does. It may be possible to trim this further, but seems like a good starting point.
Android only, Android bots green
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/11348326
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171522 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/javatests')
-rw-r--r-- | android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestRunnerApplication.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestRunnerApplication.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestRunnerApplication.java index 0c16dad..ef7e779 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestRunnerApplication.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestRunnerApplication.java @@ -12,9 +12,9 @@ import org.chromium.content.common.CommandLine; public class AndroidWebViewTestRunnerApplication extends Application { - /** The minimum set of .pak files Chrome needs. */ - private static final String[] CHROME_MANDATORY_PAKS = { - "chrome.pak", "chrome_100_percent.pak", "en-US.pak", + /** The minimum set of .pak files the test runner needs. */ + private static final String[] MANDATORY_PAKS = { + "android_webview.pak", "android_webview_strings.pak" }; @Override @@ -23,7 +23,8 @@ public class AndroidWebViewTestRunnerApplication extends Application { CommandLine.initFromFile("/data/local/chrome-command-line"); - ResourceExtractor.setMandatoryPaksToExtract(CHROME_MANDATORY_PAKS); + ResourceExtractor.setMandatoryPaksToExtract(MANDATORY_PAKS); + ResourceExtractor.setExtractImplicitLocaleForTesting(false); AwBrowserProcess.loadLibrary(); AwBrowserProcess.start(this); } |