Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f578530 authored by Alex Light's avatar Alex Light Committed by android-build-merger
Browse files

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

am: 4bc3d32b

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

Change-Id: Ia256fdb964f69c029c3b1e8e10ff396f79048cb4
parents 8491b4c0 4bc3d32b

core/java/android/app/LoadedApk.java

+5 −0
Original line number Diff line number Diff line
@@ -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);

                }