zippo: Install vendorcompat verison of protobuf

Some prebuilt vendor modules contain references to
libprotobuf-cpp-*.so, but the interface is not stable.  Upgrading
protobuf would cause those modules to fail, so the vendor version
of the new protobuf library is renamed to libprotobuf-cpp-*-3.9.1.so.
Manually install old libprotobuf-cpp-*.so files to /vendor
to avoid breaking products that have prebuilts that reference them.

Once the new version of protobuf is in each product can be
inspected for references to libprotobuf-cpp-*.so on /vendor and
these packages can be included only on those devices that need
them.

Bug: 117607748
Test: m checkbuild
Change-Id: I8ac955eb703e3faf22ff930c59b30385f374ad0a

The entry in public.libraries.txt is needed to allow the
linker to find and use the lib outside the VNDK.

Change-Id: Icc130a8a3653a6287e9af04d135b335ddcc13d5b
This commit is contained in:
Colin Cross
2020-09-19 19:52:25 +05:30
committed by Marc Bourgoin
parent bbb7a34a31
commit 3df9f8bc0c
2 changed files with 6 additions and 0 deletions

View File

@@ -9,4 +9,6 @@ libOpenCL.so
libnpu.so
libhta_controller.so
libhta_hexagon_runtime.so
libprotobuf-cpp-full.so
libprotobuf-cpp-lite.so
unnhal-acc-hta.so

View File

@@ -338,6 +338,10 @@ PRODUCT_PACKAGES += \
librmnetctl \
libxml2
PRODUCT_PACKAGES += \
libprotobuf-cpp-lite-vendorcompat \
libprotobuf-cpp-full-vendorcompat \
# Seccomp policy
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/seccomp_policy/codec2.vendor.base.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/codec2.vendor.base.policy \