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." into nyc-dev am: 57413a7

Browse Source 
am: 7ad3001

* commit '7ad3001399f1dae862285f314a6e6090e1f5b9e2':
  Make fake libart for misbehaving apps be loaded.

Change-Id: I9ac4a5f75db5cbfee4ff5d0b2670638673c831db
This commit is contained in:
TreeHugger Robot
2016-04-25 22:53:28 +00:00
committed by android-build-merger
parent dbba908fb5 7ad3001399
commit 6534e16cf7
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

@@ -379,6 +379,11 @@ public final class LoadedApk {
// Add path to libraries in apk for current abi. Do this now because more entries
// will be added to zipPaths that shouldn't be part of the library path.
if (aInfo.primaryCpuAbi != null) {
// Add fake libs into the library search path if we target prior to N.
if (aInfo.targetSdkVersion <= 23) {
outLibPaths.add("/system/fake-libs" +
(VMRuntime.is64BitAbi(aInfo.primaryCpuAbi) ? "64" : ""));
}
for (String apk : outZipPaths) {
outLibPaths.add(apk + "!/lib/" + aInfo.primaryCpuAbi);
}