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

am: 4bc3d32b15

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

Change-Id: Ia256fdb964f69c029c3b1e8e10ff396f79048cb4

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);
                 }