From a2a709140f1e91295424311fb2339c8374ee1331 Mon Sep 17 00:00:00 2001 From: ix5 Date: Wed, 29 Apr 2020 21:08:37 +0200 Subject: [PATCH] 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 --- configs/public.libraries.txt | 2 ++ device.mk | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/configs/public.libraries.txt b/configs/public.libraries.txt index 47f75dbf..6bfdd0aa 100644 --- 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 index b15bb1d2..bdb4281b 100644 --- a/device.mk +++ b/device.mk @@ -417,8 +417,7 @@ PRODUCT_PACKAGES += \ android.hardware.secure_element@1.0 \ 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 \