From 2b0b898362d5eafda99c23110026fccbcef13af2 Mon Sep 17 00:00:00 2001 From: Songchun Fan Date: Tue, 7 Jan 2020 13:27:03 -0800 Subject: [PATCH] Fix extractNativeLib condition check Should always extract native lib if it is not an incremental installation. BUG: 146781591 Test: manual and check that *.so files are extracted. $ adb install ~/Downloads/megacity.apk $ adb shell coral:/ # ls -R /data/app/com.unity.megacity-yNpLT0e2Zslj3bSo1EpYTg\=\=/lib/ /data/app/com.unity.megacity-yNpLT0e2Zslj3bSo1EpYTg==/lib/: arm64 /data/app/com.unity.megacity-yNpLT0e2Zslj3bSo1EpYTg==/lib/arm64: libil2cpp.so libmain.so libunity.so Change-Id: I2b3bdf279e5d5f48304ffe10410469d41dc34625 --- .../java/com/android/server/pm/PackageInstallerSession.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java index c8689531ed981..426cd01d3d0be 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerSession.java +++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java @@ -119,7 +119,6 @@ import com.android.internal.content.PackageHelper; import com.android.internal.os.SomeArgs; import com.android.internal.util.ArrayUtils; import com.android.internal.util.IndentingPrintWriter; -import com.android.internal.util.Preconditions; import com.android.server.LocalServices; import com.android.server.pm.Installer.InstallerException; import com.android.server.pm.dex.DexManager; @@ -1684,7 +1683,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { computeProgressLocked(true); // Unpack native libraries for non-incremental installation - if (isIncrementalInstallation()) { + if (!isIncrementalInstallation()) { extractNativeLibraries(stageDir, params.abiOverride, mayInheritNativeLibs()); } }