From 479f832aef50ca5aa59d65ba0a9c1dca693abac4 Mon Sep 17 00:00:00 2001 From: ix5 Date: Wed, 29 Apr 2020 21:08:37 +0200 Subject: [PATCH] msm8953-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 ++ msm8953.mk | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/configs/public.libraries.txt b/configs/public.libraries.txt index 9964648..085c2d7 100644 --- a/configs/public.libraries.txt +++ b/configs/public.libraries.txt @@ -9,3 +9,5 @@ libOpenCL.so libnpu.so libhta_hexagon_runtime.so unnhal-acc-hta.so +libprotobuf-cpp-full.so +libprotobuf-cpp-lite.so diff --git a/msm8953.mk b/msm8953.mk index 8cae0a3..234550b 100644 --- a/msm8953.mk +++ b/msm8953.mk @@ -358,6 +358,11 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ PRODUCT_ODM_PROPERTIES += \ ro.vendor.qti.va_odm.support=1 +# Protobuf +PRODUCT_PACKAGES += \ + libprotobuf-cpp-full-vendorcompat \ + libprotobuf-cpp-lite-vendorcompat + # QMI PRODUCT_PACKAGES += \ libjson