From 7f438b1df30029e6a6b6b404dea76c50a6918752 Mon Sep 17 00:00:00 2001
From: Vic Yang <victoryang@google.com>
Date: Mon, 9 Sep 2019 10:37:34 -0700
Subject: [PATCH] Do not dedupe libprotobuf-cpp variants

The vendor variants of libprotobuf-cpp have their version numbers
included in their names, so the SONAME field is different.  Whitelist
the 'lite' and 'full' versions to have different core and vendor
variants.

Test: Build a device with TARGET_VNDK_USE_CORE_VARIANT set.
Change-Id: I9880a5d7172a9f35f304af8e7dcababdcbc2ca23
---
 cc/config/vndk.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cc/config/vndk.go b/cc/config/vndk.go
index e754ad5ea..d7d895531 100644
--- a/cc/config/vndk.go
+++ b/cc/config/vndk.go
@@ -120,6 +120,8 @@ var VndkMustUseVendorVariantList = []string{
 	"libmedia_omx",
 	"libmemtrack",
 	"libnetutils",
+	"libprotobuf-cpp-full",
+	"libprotobuf-cpp-lite",
 	"libpuresoftkeymasterdevice",
 	"libradio_metadata",
 	"libselinux",