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

Commit 0e541ef9 authored by Gustav Sennton's avatar Gustav Sennton
Browse files

Refactor some WebView loading logic into WebViewLibraryLoader. 

This is in preparation for a patch which with bigger changes for
WebViewLibraryLoader (including tests).

Bug: 28736099
Test: ensure relro loaded into app process on 32-bit device.
Change-Id: Ic1aef697c1010380d8bce466ee14627d9cdff9e7
parent 439b62c1

core/java/android/webkit/WebViewFactory.java

+3 −25
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.content.pm.ApplicationInfo; 
import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.content.pm.Signature;

import android.os.Build;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.StrictMode;
@@ -445,38 +444,17 @@ public final class WebViewFactory { 
        }

    }



    private static int prepareWebViewInSystemServer(String[] nativeLibraryPaths) {

        if (DEBUG) Log.v(LOGTAG, "creating relro files");

        int numRelros = 0;



        // We must always trigger createRelRo regardless of the value of nativeLibraryPaths. Any

        // unexpected values will be handled there to ensure that we trigger notifying any process

        // waiting on relro creation.

        if (Build.SUPPORTED_32_BIT_ABIS.length > 0) {

            if (DEBUG) Log.v(LOGTAG, "Create 32 bit relro");

            WebViewLibraryLoader.createRelroFile(false /* is64Bit */, nativeLibraryPaths[0]);

            numRelros++;

        }



        if (Build.SUPPORTED_64_BIT_ABIS.length > 0) {

            if (DEBUG) Log.v(LOGTAG, "Create 64 bit relro");

            WebViewLibraryLoader.createRelroFile(true /* is64Bit */, nativeLibraryPaths[1]);

            numRelros++;

        }

        return numRelros;

    }



    /**

     * @hide

     */

    public static int onWebViewProviderChanged(PackageInfo packageInfo) {

        String[] nativeLibs = null;

        int startedRelroProcesses = 0;

        ApplicationInfo originalAppInfo = new ApplicationInfo(packageInfo.applicationInfo);

        try {

            fixupStubApplicationInfo(packageInfo.applicationInfo,

                                     AppGlobals.getInitialApplication().getPackageManager());



            nativeLibs = WebViewLibraryLoader.updateWebViewZygoteVmSize(packageInfo);

            startedRelroProcesses = WebViewLibraryLoader.prepareNativeLibraries(packageInfo);

        } catch (Throwable t) {

            // Log and discard errors at this stage as we must not crash the system server.

            Log.e(LOGTAG, "error preparing webview native library", t);
@@ -484,7 +462,7 @@ public final class WebViewFactory { 


        WebViewZygote.onWebViewProviderChanged(packageInfo, originalAppInfo);



        return prepareWebViewInSystemServer(nativeLibs);

        return startedRelroProcesses;

    }



    private static String WEBVIEW_UPDATE_SERVICE_NAME = "webviewupdate";

core/java/android/webkit/WebViewLibraryLoader.java

+24 −1
Original line number Diff line number Diff line
@@ -127,11 +127,34 @@ class WebViewLibraryLoader { 
        }

    }



    static int prepareNativeLibraries(PackageInfo webviewPackageInfo)

            throws WebViewFactory.MissingWebViewPackageException {

        String[] nativeLibs = updateWebViewZygoteVmSize(webviewPackageInfo);

        if (DEBUG) Log.v(LOGTAG, "creating relro files");

        int numRelros = 0;



        // We must always trigger createRelRo regardless of the value of nativeLibraryPaths. Any

        // unexpected values will be handled there to ensure that we trigger notifying any process

        // waiting on relro creation.

        if (Build.SUPPORTED_32_BIT_ABIS.length > 0) {

            if (DEBUG) Log.v(LOGTAG, "Create 32 bit relro");

            createRelroFile(false /* is64Bit */, nativeLibs[0]);

            numRelros++;

        }



        if (Build.SUPPORTED_64_BIT_ABIS.length > 0) {

            if (DEBUG) Log.v(LOGTAG, "Create 64 bit relro");

            createRelroFile(true /* is64Bit */, nativeLibs[1]);

            numRelros++;

        }

        return numRelros;

    }



    /**

     *

     * @return the native WebView libraries in the new WebView APK.

     */

    static String[] updateWebViewZygoteVmSize(PackageInfo packageInfo)

    private static String[] updateWebViewZygoteVmSize(PackageInfo packageInfo)

            throws WebViewFactory.MissingWebViewPackageException {

        // Find the native libraries of the new WebView package, to change the size of the

        // memory region in the Zygote reserved for the library.