From 987ebebfbcb9b8c8ddd05de3e4085abaf465da9f Mon Sep 17 00:00:00 2001
From: Vic Yang <victoryang@google.com>
Date: Tue, 21 Jan 2020 20:38:37 +0000
Subject: [PATCH] Revert "Clean up no-vendor-variant VNDK whitelist"

This reverts commit 882e59d45d8710310a911f8dcecd3130d8679a35.

Reason for revert: Breaking build on internal target

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

diff --git a/cc/config/vndk.go b/cc/config/vndk.go
index 1047c52a1..3b16c7896 100644
--- a/cc/config/vndk.go
+++ b/cc/config/vndk.go
@@ -18,20 +18,56 @@ package config
 // For these libraries, the vendor variants must be installed even if the device
 // has VndkUseCoreVariant set.
 var VndkMustUseVendorVariantList = []string{
+	"android.frameworks.sensorservice@1.0",
+	"android.hardware.atrace@1.0",
+	"android.hardware.audio.common@5.0",
+	"android.hardware.audio.effect@2.0",
+	"android.hardware.audio.effect@4.0",
+	"android.hardware.audio.effect@5.0",
+	"android.hardware.audio@2.0",
+	"android.hardware.audio@4.0",
+	"android.hardware.audio@5.0",
 	"android.hardware.automotive.evs@1.0",
 	"android.hardware.automotive.vehicle@2.0",
+	"android.hardware.bluetooth.audio@2.0",
+	"android.hardware.boot@1.0",
+	"android.hardware.broadcastradio@1.0",
+	"android.hardware.broadcastradio@1.1",
 	"android.hardware.broadcastradio@2.0",
 	"android.hardware.camera.device@1.0",
 	"android.hardware.camera.device@3.2",
 	"android.hardware.camera.device@3.3",
 	"android.hardware.camera.device@3.4",
 	"android.hardware.camera.provider@2.4",
+	"android.hardware.cas.native@1.0",
+	"android.hardware.cas@1.0",
+	"android.hardware.configstore@1.0",
+	"android.hardware.configstore@1.1",
+	"android.hardware.contexthub@1.0",
+	"android.hardware.drm@1.0",
+	"android.hardware.drm@1.1",
 	"android.hardware.fastboot@1.0",
+	"android.hardware.gatekeeper@1.0",
+	"android.hardware.gnss@1.0",
+	"android.hardware.graphics.allocator@2.0",
+	"android.hardware.graphics.bufferqueue@1.0",
+	"android.hardware.graphics.composer@2.1",
+	"android.hardware.graphics.composer@2.2",
+	"android.hardware.health@1.0",
+	"android.hardware.health@2.0",
+	"android.hardware.ir@1.0",
+	"android.hardware.keymaster@3.0",
+	"android.hardware.keymaster@4.0",
+	"android.hardware.light@2.0",
 	"android.hardware.media.bufferpool@1.0",
+	"android.hardware.media.omx@1.0",
+	"android.hardware.memtrack@1.0",
 	"android.hardware.neuralnetworks@1.0",
 	"android.hardware.neuralnetworks@1.1",
 	"android.hardware.neuralnetworks@1.2",
 	"android.hardware.neuralnetworks@1.3",
+	"android.hardware.nfc@1.0",
+	"android.hardware.nfc@1.1",
 	"android.hardware.nfc@1.2",
 	"android.hardware.oemlock@1.0",
 	"android.hardware.power.stats@1.0",
@@ -46,30 +82,51 @@ var VndkMustUseVendorVariantList = []string{
 	"android.hardware.soundtrigger@2.1",
 	"android.hardware.tetheroffload.config@1.0",
 	"android.hardware.tetheroffload.control@1.0",
+	"android.hardware.thermal@1.0",
+	"android.hardware.tv.cec@1.0",
+	"android.hardware.tv.input@1.0",
 	"android.hardware.vibrator-ndk_platform",
+	"android.hardware.vibrator@1.0",
+	"android.hardware.vibrator@1.1",
+	"android.hardware.vibrator@1.2",
 	"android.hardware.weaver@1.0",
 	"android.hardware.wifi.hostapd@1.0",
 	"android.hardware.wifi.offload@1.0",
 	"android.hardware.wifi.supplicant@1.0",
 	"android.hardware.wifi.supplicant@1.1",
+	"android.hardware.wifi@1.0",
 	"android.hardware.wifi@1.1",
 	"android.hardware.wifi@1.2",
 	"android.hardwareundtrigger@2.0",
 	"android.hardwareundtrigger@2.0-core",
 	"android.hardwareundtrigger@2.1",
+	"android.hidl.allocator@1.0",
+	"android.hidl.token@1.0",
+	"android.hidl.token@1.0-utils",
+	"android.system.net.netd@1.0",
+	"android.system.wifi.keystore@1.0",
 	"libaudioroute",
+	"libaudioutils",
 	"libbinder",
 	"libcamera_metadata",
 	"libcrypto",
+	"libdiskconfig",
+	"libdumpstateutil",
 	"libexpat",
+	"libfmq",
 	"libgatekeeper",
 	"libgui",
 	"libhidlcache",
 	"libkeymaster_messages",
 	"libkeymaster_portable",
+	"libmedia_helper",
+	"libmedia_omx",
+	"libmemtrack",
+	"libnetutils",
 	"libprotobuf-cpp-full",
 	"libprotobuf-cpp-lite",
 	"libpuresoftkeymasterdevice",
+	"libradio_metadata",
 	"libselinux",
 	"libsoftkeymasterdevice",
 	"libsqlite",
@@ -104,8 +161,11 @@ var VndkMustUseVendorVariantList = []string{
 	"libstagefright_soft_vpxdec",
 	"libstagefright_soft_vpxenc",
 	"libstagefright_xmlparser",
+	"libsysutils",
+	"libtinyxml2",
 	"libui",
 	"libvorbisidec",
 	"libxml2",
 	"libyuv",
+	"libziparchive",
 }