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

Commit 31d06f95 authored by Pawan Wagh's avatar Pawan Wagh
Browse files

Remove flag RELEASE_PACKAGE_LIBANDROID_RUNTIME_PUNCH_HOLES 

remove flag since it's enabled everywhere.

Test: m
Ignore-AOSP-First: Removing build flag
Bug: 379190833
Change-Id: I7fd6ff5f1c74510aca7984e6837a5f62c9542f2a
parent 82f044c5

core/jni/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ soong_config_module_type { 
    config_namespace: "ANDROID",

    bool_variables: [

        "release_binder_death_recipient_weak_from_jni",

        "release_package_libandroid_runtime_punch_holes",

    ],

    properties: [

        "cflags",
@@ -66,9 +65,6 @@ cc_library_shared_for_libandroid_runtime { 
        release_binder_death_recipient_weak_from_jni: {

            cflags: ["-DBINDER_DEATH_RECIPIENT_WEAK_FROM_JNI"],

        },

        release_package_libandroid_runtime_punch_holes: {

            cflags: ["-DENABLE_PUNCH_HOLES"],

        },

    },



    cpp_std: "gnu++20",

core/jni/com_android_internal_content_NativeLibraryHelper.cpp

+0 −4
Original line number Diff line number Diff line
@@ -236,7 +236,6 @@ static install_status_t extractNativeLibFromApk(ZipFileRO* zipFile, ZipEntryRO z 
        return INSTALL_FAILED_CONTAINER_ERROR;

    }



#ifdef ENABLE_PUNCH_HOLES

    // punch extracted elf files as well. This will fail where compression is on (like f2fs) but it

    // will be useful for ext4 based systems

    struct statfs64 fsInfo;
@@ -253,7 +252,6 @@ static install_status_t extractNativeLibFromApk(ZipFileRO* zipFile, ZipEntryRO z 
                  zipFile->getZipFileName());

        }

    }

#endif // ENABLE_PUNCH_HOLES



    ALOGV("Successfully moved %s to %s\n", localTmpFileName, localFileName);
@@ -332,7 +330,6 @@ static install_status_t copyFileIfChanged(JNIEnv* env, void* arg, ZipFileRO* zip 
            return INSTALL_FAILED_INVALID_APK;

        }



#ifdef ENABLE_PUNCH_HOLES

        // if library is uncompressed, punch hole in it in place

        if (!punchHolesInElf64(zipFile->getZipFileName(), offset)) {

            ALOGW("Failed to punch uncompressed elf file :%s inside apk : %s at offset: "
@@ -345,7 +342,6 @@ static install_status_t copyFileIfChanged(JNIEnv* env, void* arg, ZipFileRO* zip 
        if (!punchHolesInZip(zipFile->getZipFileName(), offset, extraFieldLength)) {

            ALOGW("Failed to punch apk : %s at extra field", zipFile->getZipFileName());

        }

#endif // ENABLE_PUNCH_HOLES



        return INSTALL_SUCCEEDED;

    }