[automerger skipped] Merge "Move imageMutator before archMutator" am: 572aeed6a4 am: b8e623cfee am: f6faa646a9 -s ours
am skip reason: Change-Id I65d05714b75aa462bf9816da60fdc2deda4de593 with SHA-1 9c8f687584 is in history
Change-Id: I4f62dec43c27b22a7bdcba2c791d7fbf6bd3bce9
diff --git a/cc/config/vndk.go b/cc/config/vndk.go
index c3cda49..26c0daf 100644
--- a/cc/config/vndk.go
+++ b/cc/config/vndk.go
@@ -107,6 +107,8 @@
"libaudioutils",
"libbinder",
"libcamera_metadata",
+ "libcodec2_hidl@1.0",
+ "libcodec2_vndk",
"libcrypto",
"libdiskconfig",
"libdumpstateutil",
@@ -130,6 +132,7 @@
"libsqlite",
"libssl",
"libstagefright_amrnb_common",
+ "libstagefright_bufferpool@2.0",
"libstagefright_bufferqueue_helper",
"libstagefright_enc_common",
"libstagefright_flacdec",
@@ -157,6 +160,7 @@
"libstagefright_soft_vorbisdec",
"libstagefright_soft_vpxdec",
"libstagefright_soft_vpxenc",
+ "libstagefright_softomx",
"libstagefright_xmlparser",
"libsysutils",
"libtinyxml2",
diff --git a/java/config/config.go b/java/config/config.go
index 06c99f1..0180f45 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -37,6 +37,7 @@
InstrumentFrameworkModules = []string{
"framework",
+ "framework-minus-apex",
"telephony-common",
"services",
"android.car",