diff options
Diffstat (limited to 'android_webview')
2 files changed, 8 insertions, 4 deletions
diff --git a/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java b/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java index 0b39a57..aa70dd2 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java +++ b/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java @@ -30,10 +30,6 @@ public abstract class AwBrowserProcess { */ public static void loadLibrary() { PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX); - // We don't need to extract any paks because for WebView, they are - // in the system image. TODO(joth): remove the paks and make ResourceExtractor - // a true no-op for this use-case (i.e. remove need to pass empty string here). - ResourceExtractor.setMandatoryPaksToExtract(""); LibraryLoader.setLibraryToLoad(NATIVE_LIBRARY); LibraryLoader.ensureInitialized(); } 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 7e36926..0c16dad 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 @@ -7,15 +7,23 @@ package org.chromium.android_webview.test; import android.app.Application; import org.chromium.android_webview.AwBrowserProcess; +import org.chromium.content.browser.ResourceExtractor; 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", + }; + @Override public void onCreate() { super.onCreate(); CommandLine.initFromFile("/data/local/chrome-command-line"); + + ResourceExtractor.setMandatoryPaksToExtract(CHROME_MANDATORY_PAKS); AwBrowserProcess.loadLibrary(); AwBrowserProcess.start(this); } |