sky: Replace libutils with VNDK v32 for display composer

Change-Id: I4079f46bebda0203d5af98b658eee4bcc838ed5b
This commit is contained in:
Kyuofox
2023-08-15 15:42:01 +08:00
committed by Lostark13
parent 19de47cca9
commit 2585b28c9f
4 changed files with 54 additions and 0 deletions

View File

@@ -7,5 +7,6 @@
soong_namespace {
imports: [
"hardware/qcom-caf/bootctrl",
"vendor/qcom/opensource/commonsys-intf/display",
],
}

View File

@@ -457,6 +457,10 @@ PRODUCT_PACKAGES += \
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.software.verified_boot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.verified_boot.xml
# VNDK
PRODUCT_COPY_FILES += \
prebuilts/vndk/v32/arm64/arch-arm64-armv8-a/shared/vndk-sp/libutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libutils-v32.so
# Wi-Fi
PRODUCT_PACKAGES += \
android.hardware.wifi@1.0-service \

View File

@@ -54,6 +54,14 @@ if [ -z "${SRC}" ]; then
SRC="adb"
fi
function blob_fixup() {
case "${1}" in
vendor/bin/hw/vendor.qti.hardware.display.composer-service)
"${PATCHELF}" --replace-needed "libutils.so" "libutils-v32.so" "${2}"
;;
esac
}
# Initialize the helper
setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}"

41
ndk/Android.bp Normal file
View File

@@ -0,0 +1,41 @@
cc_library_shared {
name: "vendor.qti.hardware.display.config-V1-ndk_platform",
shared_libs: ["vendor.qti.hardware.display.config-V1-ndk"],
system_ext_specific: true,
vendor_available: true,
}
cc_library_shared {
name: "vendor.qti.hardware.display.config-V2-ndk_platform",
shared_libs: ["vendor.qti.hardware.display.config-V2-ndk"],
system_ext_specific: true,
vendor_available: true,
}
cc_library_shared {
name: "vendor.qti.hardware.display.config-V3-ndk_platform",
shared_libs: ["vendor.qti.hardware.display.config-V3-ndk"],
system_ext_specific: true,
vendor_available: true,
}
cc_library_shared {
name: "vendor.qti.hardware.display.config-V4-ndk_platform",
shared_libs: ["vendor.qti.hardware.display.config-V4-ndk"],
system_ext_specific: true,
vendor_available: true,
}
cc_library_shared {
name: "vendor.qti.hardware.display.config-V5-ndk_platform",
shared_libs: ["vendor.qti.hardware.display.config-V5-ndk"],
system_ext_specific: true,
vendor_available: true,
}
cc_library_shared {
name: "vendor.qti.hardware.display.config-V6-ndk_platform",
shared_libs: ["vendor.qti.hardware.display.config-V6-ndk"],
system_ext_specific: true,
vendor_available: true,
}