commit 8ed306ce47dc3a86c38dfa17331deb076d09edea
author Nicolas Geoffray <ngeoffray@google.com> Fri Apr 05 10:44:23 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Apr 05 10:44:23 2019 -0700
tree 30e2f755c1990c4163b1c93c877b41dc85b3c143
parent 11056f6f7059354c224bb5f20bb6f108812108ca
parent fc0cc43da6ddd322b68bcef049323b23bc7ff445

Merge "Use the apex image when the device config asks for it." am: 56405f8071 am: b32c872116
am: fc0cc43da6

Change-Id: I300ecde1951467b0918b161d26588054749a0ebb

cc/config/vndk.go

diff --git a/cc/config/vndk.go b/cc/config/vndk.go
index e754ad5..99264f5 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,11 +129,13 @@
 	"libsqlite",
 	"libssl",
 	"libstagefright_amrnb_common",
+	"libstagefright_bufferpool@2.0",
 	"libstagefright_bufferqueue_helper",
 	"libstagefright_enc_common",
 	"libstagefright_flacdec",
 	"libstagefright_foundation",
 	"libstagefright_omx",
+	"libstagefright_omx_soft",
 	"libstagefright_omx_utils",
 	"libstagefright_soft_aacdec",
 	"libstagefright_soft_aacenc",