diff options
| author | 2019-09-03 22:00:13 +0000 | |
|---|---|---|
| committer | 2019-09-03 22:00:13 +0000 | |
| commit | 295e83d4e85b0e49560323f9cf7f080f6fbf6384 (patch) | |
| tree | c4cde5d494be721aeffe1c7536f26c985ed314d9 | |
| parent | 3547e7be609741281a4d901f5ebd767173446b75 (diff) | |
| parent | 7a9c6e92f41a35621f49a2d67ce1d34f52551526 (diff) | |
Merge "Merge "Update path to the new ART APEX." am: 0a4cf715f6 am: ca19446d9a am: b4c1396c5c am: 9b1711dde0" into qt-qpr1-dev-plus-aosp
| -rw-r--r-- | core/java/android/app/LoadedApk.java | 6 | ||||
| -rw-r--r-- | core/jni/fd_utils.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/java/android/app/LoadedApk.java b/core/java/android/app/LoadedApk.java index c49ea09c3a25..8987b239013c 100644 --- a/core/java/android/app/LoadedApk.java +++ b/core/java/android/app/LoadedApk.java @@ -883,7 +883,7 @@ public final class LoadedApk { } } - // /aepx/com.android.runtime/lib, /vendor/lib, /odm/lib and /product/lib + // /apex/com.android.art/lib, /vendor/lib, /odm/lib and /product/lib // are added to the native lib search paths of the classloader. // Note that this is done AFTER the classloader is // created by ApplicationLoaders.getDefault().getClassLoader(...). The @@ -904,8 +904,8 @@ public final class LoadedApk { // (linker namespace). List<String> extraLibPaths = new ArrayList<>(4); String abiSuffix = VMRuntime.getRuntime().is64Bit() ? "64" : ""; - if (!defaultSearchPaths.contains("/apex/com.android.runtime/lib")) { - extraLibPaths.add("/apex/com.android.runtime/lib" + abiSuffix); + if (!defaultSearchPaths.contains("/apex/com.android.art/lib")) { + extraLibPaths.add("/apex/com.android.art/lib" + abiSuffix); } if (!defaultSearchPaths.contains("/vendor/lib")) { extraLibPaths.add("/vendor/lib" + abiSuffix); diff --git a/core/jni/fd_utils.cpp b/core/jni/fd_utils.cpp index e5d6393530e4..18448d20ed71 100644 --- a/core/jni/fd_utils.cpp +++ b/core/jni/fd_utils.cpp @@ -80,9 +80,9 @@ bool FileDescriptorWhitelist::IsAllowed(const std::string& path) const { return true; } - // Jars from the runtime apex are allowed. - static const char* kRuntimeApexPrefix = "/apex/com.android.runtime/javalib/"; - if (android::base::StartsWith(path, kRuntimeApexPrefix) + // Jars from the ART APEX are allowed. + static const char* kArtApexPrefix = "/apex/com.android.art/javalib/"; + if (android::base::StartsWith(path, kArtApexPrefix) && android::base::EndsWith(path, kJarSuffix)) { return true; } |