Evolution-x-devices/device_xiaomi_rosemary
2
0
Fork 0
mirror of https://github.com/Evolution-X-Devices/device_xiaomi_rosemary synced 2026-01-27 13:35:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

rosemary: Link PQ and dfps HAL against VNDK 32 libutils

Browse Source 
* Abort message: 'incStrongRequireStrong() called on 0xb400007c5afa7250 which isn't already owned'

[bengris32] Patch both 32bit and 64bit variants

Change-Id: Ifae97360042bad420ef454a56b490af2202ac79a
This commit is contained in:
SamarV-121
2022-09-24 09:46:27 +01:00
committed by Matsvei Niaverau
parent d2fdc245cd
commit e51d75aec5
3 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
device.mk
View File

@@ -367,6 +367,10 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \
android.hardware.vibrator-service.rosemary
# VNDK
PRODUCT_PACKAGES += \
libutils-v32
# Wi-Fi
PRODUCT_PACKAGES += \
android.hardware.wifi.supplicant@1.0.vendor \

6
extract-files.sh
View File

@@ -61,6 +61,12 @@ function blob_fixup {
vendor/lib64/libwifi-hal-mtk.so)
"$PATCHELF" --set-soname libwifi-hal-mtk.so "${2}"
;;
vendor/lib*/hw/dfps.mt6785.so)
"${PATCHELF}" --replace-needed "libutils.so" "libutils-v32.so" "${2}"
;;
vendor/lib*/hw/vendor.mediatek.hardware.pq@2.6-impl.so)
"${PATCHELF}" --replace-needed "libutils.so" "libutils-v32.so" "${2}"
;;
vendor/bin/hw/android.hardware.keymaster@4.0-service.beanpod)
"${PATCHELF}" --add-needed "libshim_beanpod.so" "${2}"
;;

13
vndk/Android.mk Normal file
View File

@@ -0,0 +1,13 @@
LOCAL_PATH := prebuilts/vndk
include $(CLEAR_VARS)
LOCAL_MODULE := libutils-v32
LOCAL_SRC_FILES_arm := v32/arm64/arch-arm-armv8-a/shared/vndk-sp/libutils.so
LOCAL_SRC_FILES_arm64 := v32/arm64/arch-arm64-armv8-a/shared/vndk-sp/libutils.so
LOCAL_MODULE_SUFFIX := .so
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_MODULE_TARGET_ARCH := arm arm64
LOCAL_MODULE_TAGS := optional
LOCAL_CHECK_ELF_FILES := false
LOCAL_VENDOR_MODULE := true
include $(BUILD_PREBUILT)