commit 519acc37cd80f6fd018413cab39b269c041a1486
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Mar 11 23:37:05 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 11 23:37:05 2019 +0000
tree 1e07e0d8493b36f822cf3c5e6015c2af596be8cc
parent 0eaa2f428f5544343439f03e1bf26cd55049dd96
parent 0faa8012ad9c279bed480045d45d21c0bf02239b

Merge "Partial revert to not flip the default of extractNativeLibs"

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

diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index c4a574a..89c0690 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -1843,7 +1843,8 @@
             }
         }
 
-        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;
 
@@ -3718,11 +3719,10 @@
             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;
         }