diff options
| author | 2025-01-02 07:09:04 -0800 | |
|---|---|---|
| committer | 2025-01-02 07:09:04 -0800 | |
| commit | daa29aa1513985239176cd8f6f0c6bc2cf123ffa (patch) | |
| tree | d7b1ca954e5a7364fa8a8f3f96556b99d2442810 | |
| parent | 5ff58de71ba4eb449ac8f091d378ac11571f01ca (diff) | |
| parent | 6de92113e6a34285acec5be03858b9278152d64b (diff) | |
Merge "NativeLibraryHelper: clarify log about APK alignment" into main am: b14e715bc4 am: 6de92113e6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3428922
Change-Id: I0ea29eadc258e0f9d6b24bcb4721cbd7f30e86cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/jni/com_android_internal_content_NativeLibraryHelper.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp index f40cfd9f8e51..3108f1f2c7c5 100644 --- a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp +++ b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp @@ -314,8 +314,9 @@ static install_status_t copyFileIfChanged(JNIEnv* env, void* arg, ZipFileRO* zip when, uncompLen, crc); } - ALOGE("Library '%s' is not PAGE(%zu)-aligned - will not be able to open it directly " - "from apk.\n", + ALOGE("extractNativeLibs=false library '%s' is not PAGE(%zu)-" + "aligned within apk (APK alignment, not ELF alignment) -" + "will not be able to open it directly from apk.\n", fileName, kPageSize); return INSTALL_FAILED_INVALID_APK; } |