From 4c7154976342b7903fad20e00a5eaaa7ca0f193e Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 22 Aug 2019 10:01:26 -0700 Subject: [PATCH] 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 Merged-In: I8ac955eb703e3faf22ff930c59b30385f374ad0a --- target/product/base_vendor.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk index 1e1effb538..f3705ea656 100644 --- a/target/product/base_vendor.mk +++ b/target/product/base_vendor.mk @@ -75,3 +75,7 @@ PRODUCT_PACKAGES += \ # VINTF data for vendor image PRODUCT_PACKAGES += \ device_compatibility_matrix.xml \ + +PRODUCT_PACKAGES += \ + libprotobuf-cpp-lite-vendorcompat \ + libprotobuf-cpp-full-vendorcompat \