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

Commit 2f46f707 authored by Alex Light's avatar Alex Light Committed by android-build-merger
Browse files

Merge "Make fake libart for misbehaving apps be loaded." into nyc-dev am: 57413a74 am: 7ad30013 

am: 6534e16c

* commit '6534e16c':
  Make fake libart for misbehaving apps be loaded.

Change-Id: If20e1dad4170e0b9cf007a5bcd7420762deb0664
parents 1728efea 6534e16c

core/java/android/app/LoadedApk.java

+5 −0
Original line number Diff line number Diff line
@@ -383,6 +383,11 @@ public final class LoadedApk { 
            // Add path to libraries in apk for current abi. Do this now because more entries

            // will be added to zipPaths that shouldn't be part of the library path.

            if (aInfo.primaryCpuAbi != null) {

                // Add fake libs into the library search path if we target prior to N.

                if (aInfo.targetSdkVersion <= 23) {

                    outLibPaths.add("/system/fake-libs" +

                        (VMRuntime.is64BitAbi(aInfo.primaryCpuAbi) ? "64" : ""));

                }

                for (String apk : outZipPaths) {

                    outLibPaths.add(apk + "!/lib/" + aInfo.primaryCpuAbi);

                }