kitakami-common: Add prebuilt protobuf from sdk28

Change-Id: I980a9e66cc0f99b5292210428c6ae9737e5b3969
This commit is contained in:
dianlujitao 2020-09-13 16:18:28 +08:00 committed by Joel16
parent b79f56d1e6
commit 956c8b6d13
2 changed files with 20 additions and 0 deletions

View File

@ -266,6 +266,13 @@ PRODUCT_PACKAGES += \
libprotobuf-cpp-full-vendorcompat \
libprotobuf-cpp-lite-vendorcompat
# Prebuilt Protobuf
PRODUCT_COPY_FILES += \
prebuilts/vndk/v28/arm64/arch-arm-armv8-a/shared/vndk-core/libprotobuf-cpp-lite.so:$(TARGET_COPY_OUT_VENDOR)/lib/libprotobuf-cpp-lite-v28.so \
prebuilts/vndk/v28/arm64/arch-arm64-armv8-a/shared/vndk-core/libprotobuf-cpp-full.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libprotobuf-cpp-full-v28.so \
prebuilts/vndk/v28/arm64/arch-arm-armv8-a/shared/vndk-core/libprotobuf-cpp-full.so:$(TARGET_COPY_OUT_VENDOR)/lib/libprotobuf-cpp-full-v28.so \
prebuilts/vndk/v28/arm64/arch-arm64-armv8-a/shared/vndk-core/libprotobuf-cpp-lite.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libprotobuf-cpp-lite-v28.so
# Public Libraries
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/configs/public.libraries.txt:$(TARGET_COPY_OUT_VENDOR)/etc/public.libraries.txt

View File

@ -33,6 +33,19 @@ if [ ! -f "$HELPER" ]; then
fi
. "$HELPER"
function blob_fixup() {
case "${1}" in
vendor/lib/mediadrm/libwvdrmengine.so)
patchelf --replace-needed "libprotobuf-cpp-lite.so" "libprotobuf-cpp-lite-v28.so" "${2}"
;;
vendor/lib64/libwvhidl.so)
patchelf --replace-needed "libprotobuf-cpp-lite.so" "libprotobuf-cpp-lite-v28.so" "${2}"
;;
vendor/lib64/libsettings.so)
patchelf --replace-needed "libprotobuf-cpp-full.so" "libprotobuf-cpp-full-v28.so" "${2}"
;;
esac
}
# Default to sanitizing the vendor folder before extraction
CLEAN_VENDOR=true