commit af0a22ad376ff972344f2f610891999af07381e1
author Nicolas Geoffray <ngeoffray@google.com> Fri Apr 05 10:59:31 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Apr 05 10:59:31 2019 -0700
tree 30e2f755c1990c4163b1c93c877b41dc85b3c143
parent 8ed306ce47dc3a86c38dfa17331deb076d09edea
parent ac4355402aae96af3930908d2367306a74f21b87

[automerger skipped] Use the apex image when the device config asks for it. am: 0ebdd3430e -s ours
am: ac4355402a -s ours
am skip reason: change_id Id2fff6a4569d48b8e6a886cb82bdba205b0dd56a with SHA1 25c0e03520 is in history

Change-Id: I6f038c404e93a8a67d87fc2df2a95da2b3e9483c

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