exynos9610: copy vndk29 libprotobuf-cpp-lite and patchelf libwvhidl

Change-Id: I22aa2e9f1bd26fe45318e9e04bcc79e6201114a3

diff --git a/common.mk b/common.mk
index d78ac1ded60e76d985a95917baf73ad378a1dd1b..6d7ba7e5ec0ec888b99096dc1e7d69d9d4c3990d 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -279,6 +279,10 @@ PRODUCT_PACKAGES += \
     android.hardware.power@1.0-impl \
     android.hardware.power@1.0-service
 
+# 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
+
 # Public Libraries
 PRODUCT_COPY_FILES += \
     $(COMMON_PATH)/configs/public.libraries.txt:$(TARGET_COPY_OUT_VENDOR)/etc/public.libraries.txt

diff --git a/extract-files.sh b/extract-files.sh
index fe0a32e0b32c1afd2b66884fc20853c8ee1cff1a..d37e114b139c65633dea72d1f82aad4cfb086402 100755 (executable)
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -134,4 +134,6 @@ patchelf --remove-needed libhwbinder.so $BLOB_ROOT/vendor/lib64/vendor.samsung_s
 patchelf --remove-needed libhwbinder.so $BLOB_ROOT/vendor/lib64/vendor.samsung_slsi.telephony.hardware.radio@1.1.so
 patchelf --remove-needed libhwbinder.so $BLOB_ROOT/vendor/lib64/vendor.samsung_slsi.telephony.hardware.radioExternal@1.0.so
 
+patchelf --replace-needed libprotobuf-cpp-lite.so libprotobuf-cpp-lite-v29.so $BLOB_ROOT/vendor/lib/libwvhidl.so
+
 "${MY_DIR}/setup-makefiles.sh"