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

Commit 0faa8012 authored by Victor Hsieh's avatar Victor Hsieh
Browse files

Partial revert to not flip the default of extractNativeLibs 

The original changes are 4e54b521 and 12dd9cd4.

Test: atest CtsDynamicLinkerTestCases
Bug: 124353586
Bug: 112037137
Bug: 128335904
Change-Id: Ie55bc735aebcf33d1561b5c225a8bac8d68e85e2
parent d5276e9f

core/java/android/content/pm/PackageParser.java

+4 −4
Original line number Diff line number Diff line
@@ -1842,7 +1842,8 @@ public class PackageParser { 
            }

        }



        final boolean extractNativeLibsDefault = targetSdkVersion < Build.VERSION_CODES.Q;

        // TODO: flip the default based on targetSdkVersion when possible.  See b/128335904.

        final boolean extractNativeLibsDefault = true;

        final boolean extractNativeLibs = (extractNativeLibsProvided != null)

                ? extractNativeLibsProvided : extractNativeLibsDefault;
@@ -3714,11 +3715,10 @@ public class PackageParser { 
            ai.flags |= ApplicationInfo.FLAG_MULTIARCH;

        }



        final boolean extractNativeLibsDefault =

                owner.applicationInfo.targetSdkVersion < Build.VERSION_CODES.Q;

        // TODO: flip the default based on targetSdkVersion when possible.  See b/128335904.

        if (sa.getBoolean(

                com.android.internal.R.styleable.AndroidManifestApplication_extractNativeLibs,

                extractNativeLibsDefault)) {

                true)) {

            ai.flags |= ApplicationInfo.FLAG_EXTRACT_NATIVE_LIBS;

        }