walleye: Use libhidlbase-v32 for select Android P blobs

To workaround the removal of gBn/sConstructorMap from libhidl just for
the blobs that call _ZN7android8hardware7details17gBnConstructorMapE
and/or _ZN7android8hardware7details17gBsConstructorMapE.

Change-Id: I2376734cefb9d63775bd4e82feca9c588cd191ac
This commit is contained in:
Bruno Martins
2023-11-27 22:36:55 +08:00
committed by Asriadi Rahim
parent 35955cb01f
commit 2e7246460c
2 changed files with 7 additions and 0 deletions

View File

@@ -106,4 +106,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
# VNDK
PRODUCT_COPY_FILES += \
prebuilts/vndk/v32/arm64/arch-arm-armv8-a/shared/vndk-sp/libhidlbase.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libhidlbase-v32.so \
prebuilts/vndk/v32/arm64/arch-arm64-armv8-a/shared/vndk-sp/libhidlbase.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libhidlbase-v32.so \
prebuilts/vndk/v32/arm64/arch-arm64-armv8-a/shared/vndk-sp/libhidlbase.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libhidlbase-v32.so \
prebuilts/vndk/v33/arm64/arch-arm64-armv8-a/shared/vndk-sp/libutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libutils-v33.so

View File

@@ -68,6 +68,10 @@ function blob_fixup() {
vendor/bin/pm-service)
grep -q libutils-v33.so "${2}" || "${PATCHELF}" --add-needed "libutils-v33.so" "${2}"
;;
# Fix missing symbol _ZN7android8hardware7details17gBnConstructorMapE
lib*/com.qualcomm.qti.imsrtpservice@1.0.so | vendor/bin/cnd | vendor/bin/ims_rtp_daemon | vendor/bin/imsrcsd | vendor/bin/netmgrd | vendor/lib*/com.quicinc.cne.api@1.0.so)
"${PATCHELF}" --replace-needed "libhidlbase.so" "libhidlbase-v32.so" "${2}"
;;
esac
}