summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/app/LoadedApk.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/app/LoadedApk.java b/core/java/android/app/LoadedApk.java
index c6341f10c176..f3d7df24a741 100644
--- a/core/java/android/app/LoadedApk.java
+++ b/core/java/android/app/LoadedApk.java
@@ -362,6 +362,11 @@ public final class LoadedApk {
// Add path to libraries in apk for current abi
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) {
libPaths.add(apk + "!/lib/" + mApplicationInfo.primaryCpuAbi);
}