Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nicolas Geoffray
2018-12-19 08:35:24 +00:00
committed by Gerrit Code Review
parent 6227b441a0 5d1814e1b3
commit 7baf5a8d73
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/os/ZygoteInit.java
View File

@@ -536,9 +536,11 @@ public class ZygoteInit {
static ClassLoader createPathClassLoader(String classPath, int targetSdkVersion) { static ClassLoader createPathClassLoader(String classPath, int targetSdkVersion) {
String libraryPath = System.getProperty("java.library.path"); 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, return ClassLoaderFactory.createClassLoader(classPath, libraryPath, libraryPath,
ClassLoader.getSystemClassLoader(), targetSdkVersion, true /* isNamespaceShared */, parent, targetSdkVersion, true /* isNamespaceShared */, null /* classLoaderName */);
null /* classLoaderName */);
} }
/** /**