commit d270b153c735f664965b7f6fbfc7d0a58cbba8fa
author Ben Murdoch <benm@google.com> Tue Oct 28 11:41:40 2014 +0000
committer The Android Automerger <android-build@google.com> Wed Oct 29 13:29:45 2014 -0700
tree 26e149d954fa1da9777308f04314d7dd6ec4b9ee
parent 49366b8cd4a1d99d747098c8ddea7c73cb46c6b0

Always add the path to the WebView assets.

Bug: 18133926
Change-Id: I33ae4101fd6865df057e365b6f33aef0ef9fd272

chromium/java/com/android/webview/chromium/WebViewChromium.java

diff --git a/chromium/java/com/android/webview/chromium/WebViewChromium.java b/chromium/java/com/android/webview/chromium/WebViewChromium.java
index 08ad69a..a485bd2 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.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 @@
         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) {