aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordianlujitao <dianlujitao@lineageos.org>2020-09-13 16:18:28 +0800
committerDavide Garberi <dade.garberi@gmail.com>2021-10-19 15:09:38 +0200
commitcadf3a46a4c56ea5dbc7836fb5cbd8cdaac9f3b9 (patch)
tree10a07b7d6b3a6cb4e03d2c8b0cdd1bb82dc4071c
parent835a3ac1d2522eb946ec6cfa3e1c9e58b63bb7d0 (diff)
msm8996-common: Add prebuilt protobuf from sdk28
Change-Id: I980a9e66cc0f99b5292210428c6ae9737e5b3969
-rwxr-xr-xextract-files.sh8
-rwxr-xr-xmsm8996.mk4
2 files changed, 12 insertions, 0 deletions
diff --git a/extract-files.sh b/extract-files.sh
index 43217d5..2ffe24b 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -98,6 +98,14 @@ function blob_fixup() {
patchelf --remove-needed libmedia.so "${2}"
;;
+ vendor/lib64/libsettings.so)
+ patchelf --replace-needed "libprotobuf-cpp-full.so" "libprotobuf-cpp-full-v28.so" "${2}"
+ ;;
+
+ vendor/lib64/libwvhidl.so)
+ "${PATCHELF}" --replace-needed "libprotobuf-cpp-lite.so" "libprotobuf-cpp-lite-v28.so" "${2}"
+ ;;
+
# Rename vulkan.msm8953
vendor/lib/hw/vulkan.msm8996.so | vendor/lib64/hw/vulkan.msm8996.so)
patchelf --set-soname "vulkan.msm8996.so" "${2}"
diff --git a/msm8996.mk b/msm8996.mk
index 9befc89..7d26cfb 100755
--- a/msm8996.mk
+++ b/msm8996.mk
@@ -409,6 +409,10 @@ $(call inherit-product, build/target/product/verity.mk)
PRODUCT_PACKAGES += \
vndk_package
+PRODUCT_COPY_FILES += \
+ 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 \
+ 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
+
# Vibrator
PRODUCT_PACKAGES += \
android.hardware.vibrator@1.0-impl \