From c03935be3a9f3f81ccd312eaa66bc19b922aca18 Mon Sep 17 00:00:00 2001 From: ix5 Date: Wed, 29 Apr 2020 21:08:37 +0200 Subject: [PATCH] universal7885-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 Signed-off-by: SamarV-121 --- configs/public.libraries.txt | 2 ++ universal7904-common.mk | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/configs/public.libraries.txt b/configs/public.libraries.txt index f01c476..b6dca86 100644 --- a/configs/public.libraries.txt +++ b/configs/public.libraries.txt @@ -25,3 +25,5 @@ libsmart_cropping.camera.samsung.so libsurfaceutil.so libswldc_capture_core.camera.samsung.so libxcv.camera.samsung.so +libprotobuf-cpp-full.so +libprotobuf-cpp-lite.so \ No newline at end of file diff --git a/universal7904-common.mk b/universal7904-common.mk index fd8b35b..64ff993 100644 --- a/universal7904-common.mk +++ b/universal7904-common.mk @@ -72,6 +72,11 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ android.hardware.power@1.0-service.universal7904 +# 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