From 3b6554e278ef56c931dd945e33c2b6f7abe65d45 Mon Sep 17 00:00:00 2001
From: "Torne (Richard Coles)" <torne@google.com>
Date: Wed, 13 Mar 2019 12:31:59 -0400
Subject: [PATCH] Partially revert "Handle WebView assets correctly when
 multiple APKs are used."

This reverts the WebViewFactory changes from commit
527fa8f4de0459b807cbaf9d87167caff992267f which appear to have changed
the way that the asset path is updated in an incompatible way.

Bug: 124116212
Fixes: 128489090
Test: launch affected applications
Change-Id: Id53dedef4fa55a6b8cea8a60326a4b8acd3422f8
---
 core/java/android/webkit/WebViewFactory.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/webkit/WebViewFactory.java b/core/java/android/webkit/WebViewFactory.java
index 528a6a84c6303..6d88530f29d91 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()");