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

Commit 68aab5b0 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

* commit '57413a74':
  Make fake libart for misbehaving apps be loaded.

Change-Id: I2ac86c136182d5bf84ace20a6c2dda2dffe57d40
parents 14d6e5fd 57413a74

core/java/android/app/LoadedApk.java

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

                }