universal7885: Link libexynosdisplay against VNDK 32 libutils

Abort message: 'incStrongRequireStrong() called on 0x7bc685a760 which isn't already owned'
Also remove the unused VNDK copy
This commit is contained in:
SamarV-121 2022-08-17 14:54:42 +09:00 committed by roynatech2544
commit e4084571ed
2 changed files with 5 additions and 2 deletions

View file

@ -25,6 +25,9 @@ function blob_fixup {
vendor/lib*/libsensorlistener.so)
grep -q libshim_sensorndkbridge.so "$2" || "$PATCHELF" --add-needed "libshim_sensorndkbridge.so" "$2"
;;
vendor/lib*/libexynosdisplay.so)
"${PATCHELF}" --replace-needed "libutils.so" "libutils-v32.so" "${2}"
;;
esac
}

View file

@ -286,11 +286,11 @@ PRODUCT_PACKAGES += \
# VNDK
PRODUCT_COPY_FILES += \
prebuilts/vndk/v29/arm64/arch-arm-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcutils-v29.so
prebuilts/vndk/v32/arm64/arch-arm-armv8-a/shared/vndk-sp/libutils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libutils-v32.so
ifeq ($(TARGET_LOCAL_ARCH),arm64)
PRODUCT_COPY_FILES += \
prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcutils-v29.so
prebuilts/vndk/v32/arm64/arch-arm64-armv8-a/shared/vndk-sp/libutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libutils-v32.so
endif
# Workaround for vintf issues...