Merge "Fix flattened apex install dir" am: 9c32e3101e am: f87c520193 am: 8653b3f314
am: 91d1359ece
Change-Id: Ib814d7eab33eb344e4f7be976392c10ddeea977b
diff --git a/cc/config/vndk.go b/cc/config/vndk.go
index d7d8955..28eb509 100644
--- a/cc/config/vndk.go
+++ b/cc/config/vndk.go
@@ -65,6 +65,7 @@
"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",
@@ -106,6 +107,8 @@
"libaudioutils",
"libbinder",
"libcamera_metadata",
+ "libcodec2_hidl@1.0",
+ "libcodec2_vndk",
"libcrypto",
"libdiskconfig",
"libdumpstateutil",
@@ -129,6 +132,7 @@
"libsqlite",
"libssl",
"libstagefright_amrnb_common",
+ "libstagefright_bufferpool@2.0",
"libstagefright_bufferqueue_helper",
"libstagefright_enc_common",
"libstagefright_flacdec",
@@ -156,6 +160,7 @@
"libstagefright_soft_vorbisdec",
"libstagefright_soft_vpxdec",
"libstagefright_soft_vpxenc",
+ "libstagefright_softomx",
"libstagefright_xmlparser",
"libsysutils",
"libtinyxml2",