From 7667b62920cc3d53c34e581fb1ead371f9f9badc Mon Sep 17 00:00:00 2001
From: Albal Tai <albaltai@google.com>
Date: Wed, 19 Feb 2020 06:17:51 +0000
Subject: [PATCH] Revert "Another round of no-vendor-variant VNDK whitelist
 cleanup"

This reverts commit 77def87329222c465a64dac3e6179f653a37b24c.

Reason for revert: <cop revert, broken build 6217456 on git_master on cf_x86_phone-userdebug_coverage>

Change-Id: Iaf64cfe8fdfe62d397719f7ca5cc7679e5858d91
---
 cc/config/vndk.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/cc/config/vndk.go b/cc/config/vndk.go
index 8ad6a1de2..5cecbd6f5 100644
--- a/cc/config/vndk.go
+++ b/cc/config/vndk.go
@@ -19,15 +19,24 @@ package config
 // has VndkUseCoreVariant set.
 var VndkMustUseVendorVariantList = []string{
 	"android.hardware.light-ndk_platform",
+	"android.hardware.nfc@1.2",
 	"android.hardware.power-ndk_platform",
 	"android.hardware.vibrator-ndk_platform",
 	"libbinder",
 	"libcrypto",
 	"libexpat",
+	"libgatekeeper",
 	"libgui",
+	"libhidlcache",
+	"libkeymaster_messages",
+	"libkeymaster_portable",
+	"libmedia_omx",
+	"libpuresoftkeymasterdevice",
 	"libselinux",
+	"libsoftkeymasterdevice",
 	"libsqlite",
 	"libssl",
+	"libstagefright_bufferpool@2.0",
 	"libstagefright_bufferqueue_helper",
 	"libstagefright_foundation",
 	"libstagefright_omx",