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

Commit 5d1814e1 authored by Nicolas Geoffray's avatar Nicolas Geoffray
Browse files

Use the boot class loader as parent of system server loader. 

ART expects the parent of the system server class loader to
be the boot class loader during AOT, so use that at runtime too.

bug: 120039104
Test: boot test
Change-Id: I164f98d319f875d24baa360a4b3d152e8e2fc4d9
parent 0a2a1e0e

core/java/com/android/internal/os/ZygoteInit.java

+4 −2
Original line number Diff line number Diff line
@@ -536,9 +536,11 @@ public class ZygoteInit { 
    static ClassLoader createPathClassLoader(String classPath, int targetSdkVersion) {

        String libraryPath = System.getProperty("java.library.path");



        // We use the boot class loader, that's what the runtime expects at AOT.

        ClassLoader parent = ClassLoader.getSystemClassLoader().getParent();



        return ClassLoaderFactory.createClassLoader(classPath, libraryPath, libraryPath,

                ClassLoader.getSystemClassLoader(), targetSdkVersion, true /* isNamespaceShared */,

                null /* classLoaderName */);

                parent, targetSdkVersion, true /* isNamespaceShared */, null /* classLoaderName */);

    }



    /**