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

Commit 955963c1 authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by android-build-merger
Browse files

Merge "Use the boot class loader as parent of system server loader." am: 7baf5a8d

am: c2a38e56

Change-Id: I5b467cd965f89240910f6a286d723a50d621b81b
parents 4e0b70bd c2a38e56
Loading
Loading
Loading
Loading
+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 */);
    }

    /**