summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-07-08 23:47:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-08 23:47:37 +0000
commit94eb3025be427d89dc9e2e2f7b86f17abca8e142 (patch)
tree0306a74a879d57d3830f7a258eba86ab24d4ba8f /core/java
parentecdcd93c2f6ef66f1ce29b3eac60d143b63fc137 (diff)
parent4b99e3bd4957adb2121ee45c838644783443cbf9 (diff)
Merge "[pm] minor refactoring"
Diffstat (limited to 'core/java')
-rw-r--r--core/java/com/android/internal/content/NativeLibraryHelper.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/com/android/internal/content/NativeLibraryHelper.java b/core/java/com/android/internal/content/NativeLibraryHelper.java
index 476198b5311a..bbfd07b64ccf 100644
--- a/core/java/com/android/internal/content/NativeLibraryHelper.java
+++ b/core/java/com/android/internal/content/NativeLibraryHelper.java
@@ -358,6 +358,8 @@ public class NativeLibraryHelper {
createNativeLibrarySubdir(subDir);
}
+ // Even if extractNativeLibs is false, we still need to check if the native libs in the APK
+ // are valid. This is done in the native code.
int copyRet = copyNativeBinaries(handle, subDir, supportedAbi);
if (copyRet != PackageManager.INSTALL_SUCCEEDED) {
return copyRet;