santoni: 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]>
bikramdmbd · Oct 3, 2020 · a2a7091 · a2a7091
1 parent c7b6a9a
commit a2a7091
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/configs/public.libraries.txt b/configs/public.libraries.txt
@@ -3,3 +3,5 @@ libadsprpc.so
 libcdsprpc.so
 libsdsprpc.so
 libOpenCL.so
+libprotobuf-cpp-full.so
+libprotobuf-cpp-lite.so
diff --git a/device.mk b/device.mk
@@ -417,8 +417,7 @@ PRODUCT_PACKAGES += \
     [email protected] \
     libcnefeatureconfig \
     librmnetctl \
-    libxml2 \
-    libprotobuf-cpp-full
+    libxml2
 
 # Telephony
 PRODUCT_PACKAGES += \
@@ -484,6 +483,13 @@ PRODUCT_PACKAGES += \
     vndk-ext \
     libstdc++.vendor
 
+# VNDK
+# 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
+
 # Wifi
 PRODUCT_PACKAGES += \
     libwifi-hal-qcom \