Merge "Remove reference to PRODUCT-*" am: 2d531bf7e1 am: 7830315feb am: 74fa99e115 am: a9c13468d3
am: e7d101fb8c

Change-Id: I04cf110aa8e632f17517ec62421c53f2960fcbe2
diff --git a/cc/config/vndk.go b/cc/config/vndk.go
index e754ad5..a08b0e6 100644
--- a/cc/config/vndk.go
+++ b/cc/config/vndk.go
@@ -106,6 +106,8 @@
 	"libaudioutils",
 	"libbinder",
 	"libcamera_metadata",
+	"libcodec2_hidl@1.0",
+	"libcodec2_vndk",
 	"libcrypto",
 	"libdiskconfig",
 	"libdumpstateutil",
@@ -127,6 +129,7 @@
 	"libsqlite",
 	"libssl",
 	"libstagefright_amrnb_common",
+	"libstagefright_bufferpool@2.0",
 	"libstagefright_bufferqueue_helper",
 	"libstagefright_enc_common",
 	"libstagefright_flacdec",
@@ -154,6 +157,7 @@
 	"libstagefright_soft_vorbisdec",
 	"libstagefright_soft_vpxdec",
 	"libstagefright_soft_vpxenc",
+	"libstagefright_softomx",
 	"libstagefright_xmlparser",
 	"libsysutils",
 	"libtinyxml2",