From 13fbdaa0b54d25f54488f4549d199b8b89df271b Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Sun, 8 Sep 2024 22:43:03 +0100 Subject: [PATCH] sm8550-common: Use prebuilt libziparchive differently Fixes: error: module "prebuilt_libziparchive" variant "android_vendor_arm64_armv9a_shared": partition is different: system(libziparchive) != odm(prebuilt_libziparchive) Change-Id: I54addc4909a7bc2d317cb6eec6c503939f2fa478 --- extract-files.sh | 4 ++++ proprietary-files.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/extract-files.sh b/extract-files.sh index a533bd6..57daad7 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -82,6 +82,10 @@ function blob_fixup() { [ "$2" = "" ] && return 0 "${PATCHELF_0_17_2}" --replace-needed "libstdc++.so" "libstdc++_vendor.so" "${2}" ;; + odm/lib64/libextensionlayer.so) + [ "$2" = "" ] && return 0 + "${PATCHELF_0_17_2}" --replace-needed "libziparchive.so" "libziparchive_odm.so" "${2}" + ;; product/etc/sysconfig/com.android.hotwordenrollment.common.util.xml) [ "$2" = "" ] && return 0 sed -i "s/\/my_product/\/product/" "${2}" diff --git a/proprietary-files.txt b/proprietary-files.txt index 2d8b475..41e21ca 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1075,7 +1075,7 @@ odm/lib64/vendor.oplus.hardware.cameraextension-V1-service-impl.so odm/lib64/vendor.oplus.hardware.cammidasservice-V1-ndk.so odm/lib64/vendor.oplus.hardware.sendextcamcmd-V1-ndk.so odm/lib64/vendor.oplus.hardware.sendextcamcmd-V1-service-impl.so -system/lib64/libziparchive.so:odm/lib64/libziparchive.so +system/lib64/libziparchive.so:odm/lib64/libziparchive_odm.so;FIX_SONAME vendor/bin/hw/vendor.qti.camera.provider-service_64 vendor/etc/init/vendor.qti.camera.provider-service_64.rc vendor/etc/vintf/manifest/vendor.qti.camera.aon-impl-1.3.xml