From 990af8801bce4b563045d697ce4c6c935c51891a Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Mon, 21 Feb 2022 17:34:52 +0100 Subject: [PATCH] sm7125: Shim Samsung health HAL impl with libutils-v30.so Change-Id: Ia65ac92ebd215d8851cd50d8307180cdf47e3b6d --- common.mk | 4 ++++ extract-files.sh | 3 +++ proprietary-files.txt | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/common.mk b/common.mk index 333bf30..9979518 100644 --- a/common.mk +++ b/common.mk @@ -388,6 +388,10 @@ PRODUCT_PACKAGES += \ android.hardware.tetheroffload.config@1.0.vendor \ android.hardware.tetheroffload.control@1.0.vendor +# VNDK +PRODUCT_COPY_FILES += \ + prebuilts/vndk/v30/arm64/arch-arm64-armv8-a/shared/vndk-sp/libutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libutils-v30.so + # WiFi PRODUCT_PACKAGES += \ android.hardware.wifi@1.0-service \ diff --git a/extract-files.sh b/extract-files.sh index b955caa..ce3cdae 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -60,4 +60,7 @@ extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTIO # Fix proprietary blobs BLOB_ROOT="$ANDROID_ROOT"/vendor/"$VENDOR"/"$DEVICE_COMMON"/proprietary +# Replace libutils with vndk30 libutils +"${PATCHELF}" --replace-needed libutils.so libutils-v30.so $BLOB_ROOT/vendor/lib64/hw/android.hardware.health@2.0-impl-2.1-samsung.so + "${MY_DIR}/setup-makefiles.sh" diff --git a/proprietary-files.txt b/proprietary-files.txt index a6f41f7..0cc622d 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -722,7 +722,7 @@ vendor/bin/hw/android.hardware.health@2.1-service-samsung vendor/etc/init/android.hardware.health@2.1-service-samsung.rc -vendor/etc/vintf/manifest/android.hardware.health@2.1-samsung.xml vendor/lib/hw/android.hardware.health@2.0-impl-2.1-samsung.so -vendor/lib64/hw/android.hardware.health@2.0-impl-2.1-samsung.so +vendor/lib64/hw/android.hardware.health@2.0-impl-2.1-samsung.so|198198b82c376e1370e107d154859f95c8e72f86 vendor/lib/vendor.samsung.hardware.health@2.0.so vendor/lib64/vendor.samsung.hardware.health@2.0.so