From 28f0a764865f0bfb47ebfd2038d85fdcac9f4143 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Wed, 17 Jul 2019 22:10:40 +0100 Subject: Update path to the new ART APEX. Test: atest CtsJniTestCases Bug: 135753770 Exempt-From-Owner-Approval: Approved internally Change-Id: Ica35fc7f6adade19160cbb16adf5647d189ecc45 Merged-In: Ica35fc7f6adade19160cbb16adf5647d189ecc45 --- core/java/android/app/LoadedApk.java | 6 +++--- 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 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; } -- cgit v1.2.3-59-g8ed1b