From db1cb10a5023fb5e6e501d6d329693c2ed1484d3 Mon Sep 17 00:00:00 2001
From: Vic Yang <victoryang@google.com>
Date: Tue, 2 Apr 2019 13:10:23 -0700
Subject: [PATCH] Blacklist more libraries from no-vendor-variant VNDK

These VNDK libraries did not have both core and vendor variants built
for the cuttlefish target when I initially build the list, and thus
they were missed.  Add them back.

Bug: 119423884
Test: Build walleye with no-vendor-variant VNDK enabled.
Change-Id: If446256251eb2e185b0cdba95ce5c1e4f1fb8820
---
 cc/config/vndk.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cc/config/vndk.go b/cc/config/vndk.go
index 542f73759..e754ad5ea 100644
--- a/cc/config/vndk.go
+++ b/cc/config/vndk.go
@@ -65,6 +65,7 @@ var VndkMustUseVendorVariantList = []string{
 	"android.hardware.neuralnetworks@1.0",
 	"android.hardware.neuralnetworks@1.1",
 	"android.hardware.neuralnetworks@1.2",
+	"android.hardware.nfc@1.0",
 	"android.hardware.nfc@1.1",
 	"android.hardware.nfc@1.2",
 	"android.hardware.oemlock@1.0",
@@ -110,8 +111,11 @@ var VndkMustUseVendorVariantList = []string{
 	"libdumpstateutil",
 	"libexpat",
 	"libfmq",
+	"libgatekeeper",
 	"libgui",
 	"libhidlcache",
+	"libkeymaster_messages",
+	"libkeymaster_portable",
 	"libmedia_helper",
 	"libmedia_omx",
 	"libmemtrack",
@@ -122,7 +126,9 @@ var VndkMustUseVendorVariantList = []string{
 	"libsoftkeymasterdevice",
 	"libsqlite",
 	"libssl",
+	"libstagefright_amrnb_common",
 	"libstagefright_bufferqueue_helper",
+	"libstagefright_enc_common",
 	"libstagefright_flacdec",
 	"libstagefright_foundation",
 	"libstagefright_omx",
@@ -150,8 +156,10 @@ var VndkMustUseVendorVariantList = []string{
 	"libstagefright_soft_vpxenc",
 	"libstagefright_xmlparser",
 	"libsysutils",
+	"libtinyxml2",
 	"libui",
 	"libvorbisidec",
 	"libxml2",
+	"libyuv",
 	"libziparchive",
 }