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

Merge "Include /apex/com.android.runtime for native library in app classloader"

Browse Source
This commit is contained in:
vichang
2019-02-13 00:58:37 +00:00
committed by Gerrit Code Review
parent e3483a5814 a366cc8c52
commit 9de24de618
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -850,8 +850,9 @@ public final class LoadedApk {
} }
} }
// /vendor/lib, /odm/lib and /product/lib are added to the native lib search // /aepx/com.android.runtime/lib, /vendor/lib, /odm/lib and /product/lib
// paths of the classloader. Note that this is done AFTER the classloader is // 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 // created by ApplicationLoaders.getDefault().getClassLoader(...). The
// reason is because if we have added the paths when creating the classloader // reason is because if we have added the paths when creating the classloader
// above, the paths are also added to the search path of the linker namespace // above, the paths are also added to the search path of the linker namespace
@@ -868,8 +869,11 @@ public final class LoadedApk {
// System.loadLibrary(). In order to prevent the problem, we explicitly // System.loadLibrary(). In order to prevent the problem, we explicitly
// add the paths only to the classloader, and not to the native loader // add the paths only to the classloader, and not to the native loader
// (linker namespace). // (linker namespace).
List<String> extraLibPaths = new ArrayList<>(3); List<String> extraLibPaths = new ArrayList<>(4);
String abiSuffix = VMRuntime.getRuntime().is64Bit() ? "64" : ""; 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("/vendor/lib")) { if (!defaultSearchPaths.contains("/vendor/lib")) {
extraLibPaths.add("/vendor/lib" + abiSuffix); extraLibPaths.add("/vendor/lib" + abiSuffix);
} }