sdm660-common: Add protobuf vendorcompat lib

Our blobs are compiled against libprotobuf-full-cpp.so, but starting in R, Android is using a versioned naming approach, e.g. libprotobuf-cpp-full-3.9.1.so. See https://r.android.com/1109518 The entry in public.libraries.txt is needed to allow the linker to find and use the lib outside the VNDK. See https://source.android.com/devices/tech/config/namespaces_libraries [wight554: added libprotobuf-cpp-lite as well] Signed-off-by: Volodymyr Zhdanov <[email protected]> Change-Id: If505d93576a72c5ad3b39c499bd3a7160d1a1c35
ArrowOS-Devices · Sep 28, 2020 · 4b125d9 · 4b125d9
1 parent 801df03
commit 4b125d9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/configs/public.libraries.txt b/configs/public.libraries.txt
@@ -10,3 +10,5 @@ libnpu.so
 libhta_controller.so
 libhta_hexagon_runtime.so
 unnhal-acc-hta.so
+libprotobuf-cpp-full.so
+libprotobuf-cpp-lite.so
diff --git a/sdm660.mk b/sdm660.mk
@@ -462,6 +462,12 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     vndk_package
 
+# FIXME: master: compat for libprotobuf
+# See https://android-review.googlesource.com/c/platform/prebuilts/vndk/v28/+/1109518
+PRODUCT_PACKAGES += \
+    libprotobuf-cpp-full-vendorcompat \
+    libprotobuf-cpp-lite-vendorcompat
+
 PRODUCT_COPY_FILES += \
     prebuilts/vndk/v29/arm64/arch-arm-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libcutils-v29.so \
     prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libcutils-v29.so