From 4b125d95ff293fea9e723bc1f86a4dac7adf097a Mon Sep 17 00:00:00 2001 From: ix5 Date: Wed, 29 Apr 2020 21:08:37 +0200 Subject: [PATCH] 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 Change-Id: If505d93576a72c5ad3b39c499bd3a7160d1a1c35 --- configs/public.libraries.txt | 2 ++ sdm660.mk | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/configs/public.libraries.txt b/configs/public.libraries.txt index 0e42e0af..555be3f5 100644 --- 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 index fa66d529..a93fbe37 100644 --- 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