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
This commit is contained in:
Vic Yang 2019-04-02 13:10:23 -07:00
parent fc22e4eeba
commit db1cb10a50

View file

@ -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",
}