From 0a72ba7d3f762dd69b09a4bc751dc50203548ebf Mon Sep 17 00:00:00 2001
From: Alex Light <allight@google.com>
Date: Wed, 20 Apr 2016 14:07:43 -0700
Subject: [PATCH] Make fake libart for misbehaving apps be loaded.

Bug: 27775991
Change-Id: Ie4eba211e876ec0643ce6ecf6a110f3cb5e0f57e
(cherry picked from commit 20ed24fc0cbbada36e84dc1f1e86946db6e6c5a4)
---
 core/java/android/app/LoadedApk.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/java/android/app/LoadedApk.java b/core/java/android/app/LoadedApk.java
index c6341f10c176e..f3d7df24a7415 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);
                 }