[automerger skipped] DO NOT MERGE: Add tradefed_java_library_host am: 4ba82c9482 -s ours am: afb18d1927 -s ours
am skip reason: subject contains skip directive
Change-Id: I3545df59c8eba8c0a40c0273fc4a5465867beb98
diff --git a/cc/config/vndk.go b/cc/config/vndk.go
index c3cda49..902bcc1 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",
@@ -165,5 +169,6 @@
"libxml2",
"libyuv",
"libziparchive",
+ "vintf-rebootescrow-ndk_platform",
"vintf-vibrator-ndk_platform",
}
diff --git a/java/config/config.go b/java/config/config.go
index 9738454..8443693 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",