From 52efb2257390dc286a2de5bd0eedfcbe17b9b108 Mon Sep 17 00:00:00 2001 From: ix5 Date: Wed, 29 Apr 2020 21:08:37 +0200 Subject: 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: I28222c89e1e07017867088492a726ee9d45d8e6f --- configs/public.libraries.txt | 2 ++ sdm660.mk | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/configs/public.libraries.txt b/configs/public.libraries.txt index 94c0a5d..df62681 100644 --- a/configs/public.libraries.txt +++ b/configs/public.libraries.txt @@ -4,3 +4,5 @@ libcdsprpc.so libsdsprpc.so libfastcvopt.so libOpenCL.so +libprotobuf-cpp-full.so +libprotobuf-cpp-lite.so diff --git a/sdm660.mk b/sdm660.mk index e78d4bd..4cae4ba 100644 --- a/sdm660.mk +++ b/sdm660.mk @@ -373,6 +373,11 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/perf/perf-profile0.conf:$(TARGET_COPY_OUT_VENDOR)/etc/perf/perf-profile0.conf +# Protobuf +PRODUCT_PACKAGES += \ + libprotobuf-cpp-full-vendorcompat \ + libprotobuf-cpp-lite-vendorcompat + # Public Libraries PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/public.libraries.txt:$(TARGET_COPY_OUT_VENDOR)/etc/public.libraries.txt -- cgit v1.2.3