diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-03-13 18:49:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-03-13 18:49:30 +0000 |
| commit | 2b16489cd0118466287a2f4d53ee1130928a4f5a (patch) | |
| tree | 1d10249e242d5d6e3c4779b8398a706d6c7975da /core/java/android | |
| parent | 5471638fb1601a7379a131cf4d1ac516efaf0fc7 (diff) | |
| parent | 3b6554e278ef56c931dd945e33c2b6f7abe65d45 (diff) | |
Merge "Partially revert "Handle WebView assets correctly when multiple APKs are used.""
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/webkit/WebViewFactory.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebViewFactory.java b/core/java/android/webkit/WebViewFactory.java index 528a6a84c630..6d88530f29d9 100644 --- a/core/java/android/webkit/WebViewFactory.java +++ b/core/java/android/webkit/WebViewFactory.java @@ -448,7 +448,8 @@ public final class WebViewFactory { Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "WebViewFactory.getChromiumProviderClass()"); try { - new WebViewDelegate().addWebViewAssetPath(initialApplication); + initialApplication.getAssets().addAssetPathAsSharedLibrary( + webViewContext.getApplicationInfo().sourceDir); ClassLoader clazzLoader = webViewContext.getClassLoader(); Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "WebViewFactory.loadNativeLibrary()"); |