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

2016-05-18 21:05:41 +00:00
parent 9b1d64410d 0a72ba7d3f
commit 4bc3d32b15
1 changed files with 5 additions and 0 deletions
--- 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);
                }