Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85120a54 authored by Torne (Richard Coles)'s avatar Torne (Richard Coles)
Browse files

WebView: add all APKs to asset path. 

If there are multiple APKs as part of the WebView implementation (due to
splits, shared libraries, or overlays) add them all to the asset path,
instead of just the base APK.

Bug: 124116212
Test: manually tested with modified Trichrome build
Change-Id: I912e741b6de3154f66e5e82c9cf7154c6d39b1a4
parent d0166415

core/java/android/webkit/WebViewFactory.java

+3 −2
Original line number Diff line number Diff line
@@ -448,8 +448,9 @@ public final class WebViewFactory { 


            Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "WebViewFactory.getChromiumProviderClass()");

            try {

                initialApplication.getAssets().addAssetPathAsSharedLibrary(

                        webViewContext.getApplicationInfo().sourceDir);

                for (String newAssetPath : webViewContext.getApplicationInfo().getAllApkPaths()) {

                    initialApplication.getAssets().addAssetPathAsSharedLibrary(newAssetPath);

                }

                ClassLoader clazzLoader = webViewContext.getClassLoader();



                Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "WebViewFactory.loadNativeLibrary()");