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

Merge "Make fake libart for misbehaving apps be loaded."

Browse Source 
am: 4bc3d32b15

* commit '4bc3d32b15cdcae7685722e7a20007c7aa9ae949':
  Make fake libart for misbehaving apps be loaded.

Change-Id: Ia256fdb964f69c029c3b1e8e10ff396f79048cb4
This commit is contained in:
Alex Light
2016-05-18 21:13:23 +00:00
committed by android-build-merger
parent 8491b4c05d 4bc3d32b15
commit 8f578530a9
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -362,6 +362,11 @@ public final class LoadedApk {
// Add path to libraries in apk for current abi // Add path to libraries in apk for current abi
if (mApplicationInfo.primaryCpuAbi != null) { if (mApplicationInfo.primaryCpuAbi != null) {
// Add fake libs into the library search path if we target prior to N.
if (mApplicationInfo.targetSdkVersion <= 23) {
libPaths.add("/system/fake-libs" +
(VMRuntime.is64BitAbi(mApplicationInfo.primaryCpuAbi) ? "64" : ""));
}
for (String apk : apkPaths) { for (String apk : apkPaths) {
libPaths.add(apk + "!/lib/" + mApplicationInfo.primaryCpuAbi); libPaths.add(apk + "!/lib/" + mApplicationInfo.primaryCpuAbi);
} }