diff options
| author | Nanhumly <admin@warbler.cc> | 2023-06-08 05:01:48 +0000 |
|---|---|---|
| committer | Davide Garberi <dade.garberi@gmail.com> | 2023-08-12 21:49:15 +0200 |
| commit | aab74acc4218b24db3ad17d0150180334f38599f (patch) | |
| tree | 52b42c16de2df2203f84d78c1b1e2e59f528cc99 | |
| parent | 86896e811d90bc2b066eb0cd8d93c85168732767 (diff) | |
msm8996-common: Migrate to common libcutils shim
Change-Id: I0efa9f044056d16418bc08d53390f9b3ea4ac20e
Signed-off-by: Nanhumly <admin@warbler.cc>
| -rwxr-xr-x | extract-files.sh | 4 | ||||
| -rwxr-xr-x | msm8996.mk | 8 | ||||
| -rw-r--r-- | proprietary-files.txt | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/extract-files.sh b/extract-files.sh index 39e8a1e..ce17baa 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -72,7 +72,9 @@ function blob_fixup() { case "${1}" in system_ext/lib64/libdpmframework.so) - sed -i "s/libhidltransport.so/libcutils-v29.so\x00\x00\x00/" "${2}" + for LIBDPM_SHIM in $(grep -L "libcutils_shim.so" "${2}"); do + "${PATCHELF}" --add-needed "libcutils_shim.so" "$LIBDPM_SHIM" + done ;; # Patch libmmcamera2_stats_modules @@ -184,6 +184,10 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ ZukDoze +# DPM +PRODUCT_PACKAGES += \ + libcutils_shim + # DRM PRODUCT_PACKAGES += \ android.hardware.drm@1.2.vendor \ @@ -380,10 +384,6 @@ PRODUCT_SYSTEM_VERITY_PARTITION=/dev/block/bootdevice/by-name/system PRODUCT_VENDOR_VERITY_PARTITION=/dev/block/bootdevice/by-name/factory $(call inherit-product, build/target/product/verity.mk) -# VNDK -PRODUCT_COPY_FILES += \ - prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libcutils-v29.so - # Vibrator PRODUCT_PACKAGES += \ android.hardware.vibrator@1.0-impl:64 \ diff --git a/proprietary-files.txt b/proprietary-files.txt index c1be709..3ca8851 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -314,7 +314,7 @@ product/framework/dpmapi.jar:system_ext/framework/dpmapi.jar|4696df9793ad676b305 product/lib64/com.qualcomm.qti.dpm.api@1.0.so:system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so|a70cfc1be3e06cde6318d6969e114429fe1950bb product/lib64/libdpmctmgr.so:system_ext/lib64/libdpmctmgr.so|7ee0d1d40a8fc7fea924602db13717235ed2c2aa product/lib64/libdpmfdmgr.so:system_ext/lib64/libdpmfdmgr.so|cb0157da0ffe6827471662a5b7881e85165cb5aa -product/lib64/libdpmframework.so:system_ext/lib64/libdpmframework.so|c335716a1b71f538beb8b51719c1b099ae686328 +product/lib64/libdpmframework.so:system_ext/lib64/libdpmframework.so|6d4c01c4cd47f57acefcf09c9516c09125f38513 product/lib64/libdpmtcm.so:system_ext/lib64/libdpmtcm.so|a98ab3c419ebe49c6f3351ef4fa64ebda65d0e7d product/priv-app/dpmserviceapp/dpmserviceapp.apk:system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk|9fd873c5330c03c62dfdeb6540b5984588295319 vendor/bin/dpmQmiMgr|a43829d478ebc243b5f7307b44aa501a7a3c8211 |