summaryrefslogtreecommitdiff
path: root/chromium
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2014-10-28 11:41:40 +0000
committerBen Murdoch <benm@google.com>2014-10-28 16:05:16 +0000
commita77ae8970e35025840112942522e4521716c5422 (patch)
tree0ed574986c574544f2263a749fd0ac492d28a9f2 /chromium
parenta329f6b47075066d779fe3b020d971cd66a3bf5f (diff)
downloadwebview-a77ae8970e35025840112942522e4521716c5422.tar.gz
Always add the path to the WebView assets.
Bug: 18133926 Change-Id: I33ae4101fd6865df057e365b6f33aef0ef9fd272 (cherry picked from commit ddbcc0351201dc71b48252573b37da33deba1a83)
Diffstat (limited to 'chromium')
-rw-r--r--chromium/java/com/android/webview/chromium/WebViewChromium.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/chromium/java/com/android/webview/chromium/WebViewChromium.java b/chromium/java/com/android/webview/chromium/WebViewChromium.java
index a5b31b3..a8b6fb5 100644
--- a/chromium/java/com/android/webview/chromium/WebViewChromium.java
+++ b/chromium/java/com/android/webview/chromium/WebViewChromium.java
@@ -58,6 +58,7 @@ import android.webkit.WebChromeClient;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
+import android.webkit.WebViewFactory;
import android.webkit.WebViewProvider;
import android.webkit.WebChromeClient.CustomViewCallback;
import android.widget.TextView;
@@ -165,6 +166,8 @@ class WebViewChromium implements WebViewProvider,
mAppTargetSdkVersion = mWebView.getContext().getApplicationInfo().targetSdkVersion;
mFactory = factory;
mRunQueue = new WebViewChromiumRunQueue();
+ String webViewAssetPath = WebViewFactory.getLoadedPackageInfo().applicationInfo.sourceDir;
+ mWebView.getContext().getAssets().addAssetPath(webViewAssetPath);
}
static void completeWindowCreation(WebView parent, WebView child) {