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."

Browse Source
This commit is contained in:
Martin Stjernholm
2019-08-22 15:00:09 +00:00
committed by Android (Google) Code Review
parent 55a6847a19 3de5cbbd1c
commit b36a5bc699
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);