From 12dd9cd46cca3f4376491fc52591d80475a9470e Mon Sep 17 00:00:00 2001
From: Victor Hsieh <victorhsieh@google.com>
Date: Mon, 14 Jan 2019 20:56:40 -0800
Subject: [PATCH] Fix default of extractNativeLibs in parseBaseApplication

This is a missed change in 4e54b521bcd72a7eba5e79d493b0309167ed6b77.

Test: adb install, check that libs are really not extracted.
Bug: 112037137
Change-Id: I0b819d656eb427c4b7b35e027808b87f3aad3c15
---
 core/java/android/content/pm/PackageParser.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index 0fc50c6911b50..7961ab00c3353 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -3760,9 +3760,11 @@ public class PackageParser {
             ai.flags |= ApplicationInfo.FLAG_MULTIARCH;
         }
 
+        final boolean extractNativeLibsDefault =
+                owner.applicationInfo.targetSdkVersion < Build.VERSION_CODES.Q;
         if (sa.getBoolean(
                 com.android.internal.R.styleable.AndroidManifestApplication_extractNativeLibs,
-                true)) {
+                extractNativeLibsDefault)) {
             ai.flags |= ApplicationInfo.FLAG_EXTRACT_NATIVE_LIBS;
         }