Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Improve readability"

Browse Source
This commit is contained in:
TreeHugger Robot
2023-06-01 19:01:37 +00:00
committed by Android (Google) Code Review
parent 72d1599f3d c712da8139
commit ac2a88a6c0
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/jni/com_android_internal_content_NativeLibraryHelper.cpp
View File

@@ -149,7 +149,12 @@ copyFileIfChanged(JNIEnv *env, void* arg, ZipFileRO* zipFile, ZipEntryRO zipEntr
return INSTALL_FAILED_INVALID_APK;
}
if (!extractNativeLibs && (!debuggable || strcmp(fileName, "wrap.sh") != 0)) {
// Always extract wrap.sh for debuggable, even if extractNativeLibs=false. This makes it
// easier to use wrap.sh because it only works when it is extracted, see
// frameworks/base/services/core/java/com/android/server/am/ProcessList.java.
bool forceExtractCurrentFile = debuggable && strcmp(fileName, "wrap.sh") == 0;
if (!extractNativeLibs && !forceExtractCurrentFile) {
// check if library is uncompressed and page-aligned
if (method != ZipFileRO::kCompressStored) {
ALOGE("Library '%s' is compressed - will not be able to open it directly from apk.\n",