From 657ce21faab185da012bdadbb1dffc02484f3373 Mon Sep 17 00:00:00 2001 From: Jan Altensen Date: Wed, 23 Sep 2020 02:41:47 +0400 Subject: [PATCH] universal8895: Add prebuilt protobuf from sdk29 Change-Id: I706c5a88e39018ec5b2e4633069893017417ea47 --- device-common.mk | 7 +++++++ extract-files.sh | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/device-common.mk b/device-common.mk index 66fd2e5..a8f6364 100644 --- a/device-common.mk +++ b/device-common.mk @@ -283,6 +283,13 @@ PRODUCT_PACKAGES += \ # Vendor security patch level PRODUCT_PROPERTY_OVERRIDES += \ ro.lineage.build.vendor_security_patch=2020-04-01 + +# Protobuf +PRODUCT_COPY_FILES += \ + prebuilts/vndk/v29/arm64/arch-arm-armv8-a/shared/vndk-core/libprotobuf-cpp-lite.so:$(TARGET_COPY_OUT_VENDOR)/lib/libprotobuf-cpp-lite-v29.so \ + prebuilts/vndk/v29/arm64/arch-arm-armv8-a/shared/vndk-core/libprotobuf-cpp-full.so:$(TARGET_COPY_OUT_VENDOR)/lib/libprotobuf-cpp-full-v29.so \ + prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-core/libprotobuf-cpp-lite.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libprotobuf-cpp-lite-v29.so \ + prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-core/libprotobuf-cpp-full.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libprotobuf-cpp-full-v29.so # Vibrator PRODUCT_PACKAGES += \ diff --git a/extract-files.sh b/extract-files.sh index 86ac682..fdb5ab2 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -172,4 +172,12 @@ patchelf --remove-needed libhwbinder.so $BLOB_ROOT/vendor/lib64/vendor.samsung.h patchelf --remove-needed libhwbinder.so $BLOB_ROOT/vendor/lib64/vendor.samsung.hardware.radio.channel@2.0.so patchelf --remove-needed libhwbinder.so $BLOB_ROOT/vendor/lib64/vendor.samsung.hardware.radio@2.0.so +# Protobuf +patchelf --replace-needed libprotobuf-cpp-lite.so libprotobuf-cpp-lite-v29.so $BLOB_ROOT/vendor/lib/libwvhidl.so +patchelf --replace-needed libprotobuf-cpp-lite.so libprotobuf-cpp-lite-v29.so $BLOB_ROOT/vendor/lib/mediadrm/libwvdrmengine.so +patchelf --replace-needed libprotobuf-cpp-full.so libprotobuf-cpp-full-v29.so $BLOB_ROOT/vendor/lib/libsec-ril-dsds.so +patchelf --replace-needed libprotobuf-cpp-full.so libprotobuf-cpp-full-v29.so $BLOB_ROOT/vendor/lib/libsec-ril.so +patchelf --replace-needed libprotobuf-cpp-full.so libprotobuf-cpp-full-v29.so $BLOB_ROOT/vendor/lib64/libsec-ril-dsds.so +patchelf --replace-needed libprotobuf-cpp-full.so libprotobuf-cpp-full-v29.so $BLOB_ROOT/vendor/lib64/libsec-ril.so + "${MY_DIR}/setup-makefiles.sh" -- 2.20.1