Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6de92113 authored by Pawan Wagh's avatar Pawan Wagh Committed by Automerger Merge Worker
Browse files

Merge "NativeLibraryHelper: clarify log about APK alignment" into main am: b14e715b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3428922



Change-Id: Id5cd984ebe97dbe72ec740a5b50f6d70dde84eb9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4660f140 b14e715b

core/jni/com_android_internal_content_NativeLibraryHelper.cpp

+3 −2
Original line number Diff line number Diff line
@@ -306,8 +306,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;

        }