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" am: 9de24de618 am: 8c6c630bcf

Browse Source 
am: 0865347dac

Change-Id: Ief054415f94a48aec923524ba34c6b8f546cb040
This commit is contained in:
vichang
2019-02-12 20:22:21 -08:00
committed by android-build-merger
parent 3fcc0465b9 0865347dac
commit eea3e9002a
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

@@ -870,8 +870,9 @@ public final class LoadedApk {
}
}
// /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
// /aepx/com.android.runtime/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
// 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
@@ -888,8 +889,11 @@ public final class LoadedApk {
// System.loadLibrary(). In order to prevent the problem, we explicitly
// add the paths only to the classloader, and not to the native loader
// (linker namespace).
List<String> extraLibPaths = new ArrayList<>(3);
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("/vendor/lib")) {
extraLibPaths.add("/vendor/lib" + abiSuffix);
}