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

Merge "Update path to the new ART APEX." am: 0a4cf715f6

Browse Source 
am: ca19446d9a

Change-Id: I52cb2b75f65bdcd4aa3e2d2a33bbed79159d7f27
This commit is contained in:
Martin Stjernholm
2019-09-02 04:03:53 -07:00
committed by android-build-merger
parent de500155f1 ca19446d9a
commit b4c1396c5c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/LoadedApk.java
View File

@@ -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);

6
core/jni/fd_utils.cpp
View File

@@ -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;
}