diff options
author | Martin Stjernholm <mast@google.com> | 2019-09-02 10:28:30 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-09-02 10:28:30 +0000 |
commit | 0a4cf715f6c6db263ebcadb729b6444ad067a52b (patch) | |
tree | cee6171725ffb58a805ce39f8437ec31ff666a56 | |
parent | 288c75d055981e708dd6e752df38713fa2633fff (diff) | |
parent | 28f0a764865f0bfb47ebfd2038d85fdcac9f4143 (diff) | |
download | base-0a4cf715f6c6db263ebcadb729b6444ad067a52b.tar.gz |
Merge "Update path to the new ART APEX."
-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 3603b56c44c6..84576d96cc87 100644 --- a/core/java/android/app/LoadedApk.java +++ b/core/java/android/app/LoadedApk.java @@ -862,7 +862,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 @@ -883,8 +883,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 6d10fc2b37db..7a8bc93de59f 100644 --- a/core/jni/fd_utils.cpp +++ b/core/jni/fd_utils.cpp @@ -79,9 +79,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; } |