diff options
| author | Dimitry Ivanov <dimitry@google.com> | 2016-10-07 08:34:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-10-07 08:34:41 +0000 |
| commit | a8135325c1012abf47c689d730080567c7eb2895 (patch) | |
| tree | eebc62cca10e275530baec4d9917df919faf6c7d | |
| parent | 7c4efe421cf51eea29a86e506a98b81cbfc4e475 (diff) | |
| parent | 9e9061f608abc6ae76f1b190c62ad5336f65ec89 (diff) | |
| download | base-a8135325c1012abf47c689d730080567c7eb2895.tar.gz | |
Merge "Relax namespace restriction on system server classloader"
| -rw-r--r-- | core/java/com/android/internal/os/ZygoteInit.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java index 52b72a4e9991..1c307c9410f3 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java @@ -476,11 +476,11 @@ public class ZygoteInit { */ private static PathClassLoader createSystemServerClassLoader(String systemServerClasspath, int targetSdkVersion) { - String librarySearchPath = System.getProperty("java.library.path"); + String libraryPath = System.getProperty("java.library.path"); return PathClassLoaderFactory.createClassLoader(systemServerClasspath, - librarySearchPath, - null /* libraryPermittedPath */, + libraryPath, + libraryPath, ClassLoader.getSystemClassLoader(), targetSdkVersion, true /* isNamespaceShared */); |