vndk-def: Update eligible list 29

Test: ./vndk_definition_tool.py check-deps \
      --tag-file datasets/eligible-list-29.csv \
      --system ... --vendor ...

Change-Id: I1a94a97b3059483dc96fa148fc1f3f45a877ea9c

2 files changed, 78 insertions, 35 deletions

diff --git a/vndk/tools/definition-tool/datasets/eligible-list-29-properties.csv b/vndk/tools/definition-tool/datasets/eligible-list-29-properties.csv
index 633a0aa83..be2388a8e 100644
--- a/vndk/tools/definition-tool/datasets/eligible-list-29-properties.csv
+++ b/vndk/tools/definition-tool/datasets/eligible-list-29-properties.csv
@@ -55,6 +55,8 @@ android.hardware.biometrics.fingerprint@2.1,True,False,True,hidl_interface
 android.hardware.biometrics.fingerprint@2.1-adapter-helper,True,False,True,hidl_interface
 android.hardware.bluetooth.a2dp@1.0,True,False,True,hidl_interface
 android.hardware.bluetooth.a2dp@1.0-adapter-helper,True,False,True,hidl_interface
+android.hardware.bluetooth.audio@2.0,True,False,True,hidl_interface
+android.hardware.bluetooth.audio@2.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.bluetooth@1.0,True,False,True,hidl_interface
 android.hardware.bluetooth@1.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.boot@1.0,True,False,True,hidl_interface
@@ -85,17 +87,19 @@ android.hardware.camera.metadata@3.4,True,False,True,hidl_interface
 android.hardware.camera.metadata@3.4-adapter-helper,True,False,True,hidl_interface
 android.hardware.camera.provider@2.4,True,False,True,hidl_interface
 android.hardware.camera.provider@2.4-adapter-helper,True,False,True,hidl_interface
+android.hardware.camera.provider@2.5,True,False,True,hidl_interface
+android.hardware.camera.provider@2.5-adapter-helper,True,False,True,hidl_interface
 android.hardware.cas.native@1.0,True,False,True,hidl_interface
 android.hardware.cas.native@1.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.cas@1.0,True,False,True,hidl_interface
 android.hardware.cas@1.0-adapter-helper,True,False,True,hidl_interface
+android.hardware.cas@1.1,True,False,True,hidl_interface
+android.hardware.cas@1.1-adapter-helper,True,False,True,hidl_interface
 android.hardware.configstore-utils,True,False,True,cc_library_shared
 android.hardware.configstore@1.0,True,False,True,hidl_interface
 android.hardware.configstore@1.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.configstore@1.1,True,False,True,hidl_interface
 android.hardware.configstore@1.1-adapter-helper,True,False,True,hidl_interface
-android.hardware.configstore@1.2,True,False,True,hidl_interface
-android.hardware.configstore@1.2-adapter-helper,True,False,True,hidl_interface
 android.hardware.confirmationui-support-lib,True,False,True,cc_library
 android.hardware.confirmationui@1.0,True,False,True,hidl_interface
 android.hardware.confirmationui@1.0-adapter-helper,True,False,True,hidl_interface
@@ -115,6 +119,8 @@ android.hardware.gatekeeper@1.0,True,False,True,hidl_interface
 android.hardware.gatekeeper@1.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.gnss.measurement_corrections@1.0,True,False,True,hidl_interface
 android.hardware.gnss.measurement_corrections@1.0-adapter-helper,True,False,True,hidl_interface
+android.hardware.gnss.visibility_control@1.0,True,False,True,hidl_interface
+android.hardware.gnss.visibility_control@1.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.gnss@1.0,True,False,True,hidl_interface
 android.hardware.gnss@1.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.gnss@1.1,True,False,True,hidl_interface
@@ -123,6 +129,8 @@ android.hardware.gnss@2.0,True,False,True,hidl_interface
 android.hardware.gnss@2.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.graphics.allocator@2.0,True,False,True,hidl_interface
 android.hardware.graphics.allocator@2.0-adapter-helper,True,False,True,hidl_interface
+android.hardware.graphics.allocator@3.0,True,False,True,hidl_interface
+android.hardware.graphics.allocator@3.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.graphics.bufferqueue@1.0,True,False,True,hidl_interface
 android.hardware.graphics.bufferqueue@1.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.graphics.bufferqueue@2.0,True,False,True,hidl_interface
@@ -143,12 +151,18 @@ android.hardware.graphics.mapper@2.0,True,True,True,hidl_interface
 android.hardware.graphics.mapper@2.0-adapter-helper,True,True,True,hidl_interface
 android.hardware.graphics.mapper@2.1,True,True,True,hidl_interface
 android.hardware.graphics.mapper@2.1-adapter-helper,True,True,True,hidl_interface
+android.hardware.graphics.mapper@3.0,True,True,True,hidl_interface
+android.hardware.graphics.mapper@3.0-adapter-helper,True,True,True,hidl_interface
 android.hardware.health.storage@1.0,True,False,True,hidl_interface
 android.hardware.health.storage@1.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.health@1.0,True,False,True,hidl_interface
 android.hardware.health@1.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.health@2.0,True,False,True,hidl_interface
 android.hardware.health@2.0-adapter-helper,True,False,True,hidl_interface
+android.hardware.input.classifier@1.0,True,False,True,hidl_interface
+android.hardware.input.classifier@1.0-adapter-helper,True,False,True,hidl_interface
+android.hardware.input.common@1.0,True,False,True,hidl_interface
+android.hardware.input.common@1.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.ir@1.0,True,False,True,hidl_interface
 android.hardware.ir@1.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.keymaster@3.0,True,False,True,hidl_interface
@@ -179,6 +193,8 @@ android.hardware.nfc@1.0,True,False,True,hidl_interface
 android.hardware.nfc@1.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.nfc@1.1,True,False,True,hidl_interface
 android.hardware.nfc@1.1-adapter-helper,True,False,True,hidl_interface
+android.hardware.nfc@1.2,True,False,True,hidl_interface
+android.hardware.nfc@1.2-adapter-helper,True,False,True,hidl_interface
 android.hardware.oemlock@1.0,True,False,True,hidl_interface
 android.hardware.oemlock@1.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.power.stats@1.0,True,False,True,hidl_interface
@@ -213,6 +229,8 @@ android.hardware.renderscript@1.0,True,True,True,hidl_interface
 android.hardware.renderscript@1.0-adapter-helper,True,True,True,hidl_interface
 android.hardware.secure_element@1.0,True,False,True,hidl_interface
 android.hardware.secure_element@1.0-adapter-helper,True,False,True,hidl_interface
+android.hardware.secure_element@1.1,True,False,True,hidl_interface
+android.hardware.secure_element@1.1-adapter-helper,True,False,True,hidl_interface
 android.hardware.sensors@1.0,True,False,True,hidl_interface
 android.hardware.sensors@1.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.sensors@2.0,True,False,True,hidl_interface
@@ -266,6 +284,8 @@ android.hardware.thermal@2.0,True,False,True,hidl_interface
 android.hardware.thermal@2.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.tv.cec@1.0,True,False,True,hidl_interface
 android.hardware.tv.cec@1.0-adapter-helper,True,False,True,hidl_interface
+android.hardware.tv.cec@2.0,True,False,True,hidl_interface
+android.hardware.tv.cec@2.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.tv.input@1.0,True,False,True,hidl_interface
 android.hardware.tv.input@1.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.usb.gadget@1.0,True,False,True,hidl_interface
@@ -274,12 +294,16 @@ android.hardware.usb@1.0,True,False,True,hidl_interface
 android.hardware.usb@1.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.usb@1.1,True,False,True,hidl_interface
 android.hardware.usb@1.1-adapter-helper,True,False,True,hidl_interface
+android.hardware.usb@1.2,True,False,True,hidl_interface
+android.hardware.usb@1.2-adapter-helper,True,False,True,hidl_interface
 android.hardware.vibrator@1.0,True,False,True,hidl_interface
 android.hardware.vibrator@1.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.vibrator@1.1,True,False,True,hidl_interface
 android.hardware.vibrator@1.1-adapter-helper,True,False,True,hidl_interface
 android.hardware.vibrator@1.2,True,False,True,hidl_interface
 android.hardware.vibrator@1.2-adapter-helper,True,False,True,hidl_interface
+android.hardware.vibrator@1.3,True,False,True,hidl_interface
+android.hardware.vibrator@1.3-adapter-helper,True,False,True,hidl_interface
 android.hardware.vr@1.0,True,False,True,hidl_interface
 android.hardware.vr@1.0-adapter-helper,True,False,True,hidl_interface
 android.hardware.weaver@1.0,True,False,True,hidl_interface
@@ -355,6 +379,7 @@ libbacktrace,True,True,False,cc_library
 libbase,True,True,True,cc_library
 libbcinfo,True,True,True,cc_library_shared
 libbinder,True,False,True,cc_library_shared
+libbinder_ndk,False,False,True,cc_library
 libbinderthreadstate,True,True,False,cc_library
 libbinderwrapper,False,False,True,cc_library_shared
 libblas,True,True,False,cc_library_shared
@@ -378,9 +403,9 @@ libclang_rt.ubsan_standalone-arm-android,True,False,True,libclang_rt_prebuilt_li
 libclang_rt.ubsan_standalone-i686-android,True,False,True,libclang_rt_prebuilt_library_shared
 libclang_rt.ubsan_standalone-x86_64-android,True,False,True,libclang_rt_prebuilt_library_shared
 libcn-cbor,True,False,True,cc_library
-libcodec2,False,False,True,cc_library_shared
+libcodec2,True,False,True,cc_library_shared
 libcodec2_component_wrapper,False,False,True,cc_library_shared
-libcodec2_hidl@1.0,False,False,True,cc_library
+libcodec2_hidl@1.0,True,False,True,cc_library
 libcodec2_hidl_utils@1.0,False,False,True,cc_library
 libcodec2_serviceregistrant,False,False,True,cc_library_shared
 libcodec2_simple_component,False,False,True,cc_library_shared
@@ -390,6 +415,7 @@ libcodec2_soft_amrnbdec,False,False,True,cc_library_shared
 libcodec2_soft_amrnbenc,False,False,True,cc_library_shared
 libcodec2_soft_amrwbdec,False,False,True,cc_library_shared
 libcodec2_soft_amrwbenc,False,False,True,cc_library_shared
+libcodec2_soft_av1dec,False,False,True,cc_library_shared
 libcodec2_soft_avcdec,False,False,True,cc_library_shared
 libcodec2_soft_avcenc,False,False,True,cc_library_shared
 libcodec2_soft_common,False,False,True,cc_library_shared
@@ -401,11 +427,13 @@ libcodec2_soft_gsmdec,False,False,True,cc_library_shared
 libcodec2_soft_h263dec,False,False,True,cc_library_shared
 libcodec2_soft_h263enc,False,False,True,cc_library_shared
 libcodec2_soft_hevcdec,False,False,True,cc_library_shared
+libcodec2_soft_hevcenc,False,False,True,cc_library_shared
 libcodec2_soft_mp3dec,False,False,True,cc_library_shared
 libcodec2_soft_mpeg2dec,False,False,True,cc_library_shared
 libcodec2_soft_mpeg4dec,False,False,True,cc_library_shared
 libcodec2_soft_mpeg4enc,False,False,True,cc_library_shared
 libcodec2_soft_opusdec,False,False,True,cc_library_shared
+libcodec2_soft_opusenc,False,False,True,cc_library_shared
 libcodec2_soft_rawdec,False,False,True,cc_library_shared
 libcodec2_soft_vorbisdec,False,False,True,cc_library_shared
 libcodec2_soft_vp8dec,False,False,True,cc_library_shared
@@ -413,13 +441,14 @@ libcodec2_soft_vp8enc,False,False,True,cc_library_shared
 libcodec2_soft_vp9dec,False,False,True,cc_library_shared
 libcodec2_soft_vp9enc,False,False,True,cc_library_shared
 libcodec2_soft_xaacdec,False,False,True,cc_library_shared
-libcodec2_vndk,False,False,True,cc_library_shared
+libcodec2_vndk,True,False,True,cc_library_shared
 libcompiler_rt,True,True,False,cc_library
 libcrypto,True,False,True,cc_library
 libcrypto_utils,True,False,True,cc_library
 libcurl,True,False,True,cc_library
 libcutils,True,True,True,cc_library
 libdemangle,False,False,True,cc_library
+libdexfile_support,False,False,True,cc_library
 libdiskconfig,True,False,True,cc_library
 libdng_sdk,False,False,True,cc_library
 libdrm,False,False,True,cc_library
@@ -447,18 +476,18 @@ libhwbinder,True,True,True,cc_library
 libhwbinder_noltopgo,True,True,True,cc_library
 libion,True,True,True,cc_library
 libjpeg,True,False,True,cc_library
-libjsoncpp,False,False,True,cc_library
+libjsoncpp,True,True,True,cc_library
 libkeymaster4,False,False,True,cc_library_shared
 libkeymaster4support,False,False,True,cc_library
 libkeymaster_messages,True,False,True,cc_library_shared
 libkeymaster_portable,True,False,True,cc_library
 libkmsxx,False,False,True,cc_library_shared
-liblayers_proto,False,False,True,cc_library_shared
 libldacBT_abr,True,False,True,cc_library_shared
 libldacBT_enc,True,False,True,cc_library_shared
 liblz4,True,False,True,cc_library
 liblzma,True,True,True,cc_library
 libmedia_codecserviceregistrant,False,False,True,cc_library_shared
+libmedia_ecoservice,False,False,True,cc_library_shared
 libmedia_helper,True,False,True,cc_library
 libmedia_omx,True,False,True,cc_library_shared
 libmemtrack,True,False,True,cc_library_shared
@@ -468,13 +497,13 @@ libmojo,False,False,True,cc_library_shared
 libnetutils,True,False,True,cc_library_shared
 libnl,True,False,True,cc_library
 libopus,True,False,True,cc_library_shared
-libpagemap,True,False,True,cc_library
 libpcap,False,False,True,cc_library
 libpcre2,True,False,True,cc_library
 libperfmgr,False,False,True,cc_library
 libpiex,True,False,True,cc_library_shared
 libpng,True,False,True,cc_library
 libpower,True,False,True,cc_library
+libprocessgroup,True,True,True,cc_library
 libprocinfo,True,False,True,cc_library
 libprotobuf-cpp-full,True,False,True,cc_library_shared
 libprotobuf-cpp-full-rtti,False,False,True,cc_library_shared
@@ -490,7 +519,7 @@ libsqlite,True,False,True,cc_library
 libssl,True,False,True,cc_library
 libstagefright_amrnb_common,True,False,True,cc_library_shared
 libstagefright_bufferpool@1.0,False,False,True,cc_library
-libstagefright_bufferpool@2.0,False,False,True,cc_library
+libstagefright_bufferpool@2.0,True,False,True,cc_library
 libstagefright_bufferqueue_helper,True,False,True,cc_library_shared
 libstagefright_ccodec_utils,False,False,True,cc_library_shared
 libstagefright_codec2,False,False,True,cc_library_shared
@@ -553,12 +582,11 @@ libstagefright_soft_vpxdec,True,False,True,cc_library_shared
 libstagefright_soft_vpxenc,True,False,True,cc_library_shared
 libstagefright_soft_xaacdec,False,False,True,cc_library_shared
 libstagefright_xmlparser,True,False,True,cc_library_shared
-libsysutils,True,False,True,cc_library_shared
+libsysutils,True,False,True,cc_library
 libtextclassifier_hash,False,False,True,cc_library_shared
 libtinyalsa,True,False,True,cc_library
 libtinyxml2,True,False,True,cc_library
 libui,True,False,True,cc_library_shared
-libunwind,True,True,False,cc_library
 libunwindstack,True,True,True,cc_library
 libusb,False,False,True,cc_library
 libusbhost,True,False,True,cc_library
diff --git a/vndk/tools/definition-tool/datasets/eligible-list-29.csv b/vndk/tools/definition-tool/datasets/eligible-list-29.csv
index 4ea670f59..f4b7ba737 100644
--- a/vndk/tools/definition-tool/datasets/eligible-list-29.csv
+++ b/vndk/tools/definition-tool/datasets/eligible-list-29.csv
@@ -27,6 +27,7 @@ Path,Tag,Comments
 /system/${LIB}/android.hardware.biometrics.face@1.0.so,VNDK,
 /system/${LIB}/android.hardware.biometrics.fingerprint@2.1.so,VNDK,
 /system/${LIB}/android.hardware.bluetooth.a2dp@1.0.so,VNDK,
+/system/${LIB}/android.hardware.bluetooth.audio@2.0.so,VNDK,
 /system/${LIB}/android.hardware.bluetooth@1.0.so,VNDK,
 /system/${LIB}/android.hardware.boot@1.0.so,VNDK,
 /system/${LIB}/android.hardware.broadcastradio@1.0.so,VNDK,
@@ -42,12 +43,13 @@ Path,Tag,Comments
 /system/${LIB}/android.hardware.camera.metadata@3.3.so,VNDK,
 /system/${LIB}/android.hardware.camera.metadata@3.4.so,VNDK,
 /system/${LIB}/android.hardware.camera.provider@2.4.so,VNDK,
+/system/${LIB}/android.hardware.camera.provider@2.5.so,VNDK,
 /system/${LIB}/android.hardware.cas.native@1.0.so,VNDK,
 /system/${LIB}/android.hardware.cas@1.0.so,VNDK,
+/system/${LIB}/android.hardware.cas@1.1.so,VNDK,
 /system/${LIB}/android.hardware.configstore-utils.so,VNDK,
 /system/${LIB}/android.hardware.configstore@1.0.so,VNDK,
 /system/${LIB}/android.hardware.configstore@1.1.so,VNDK,
-/system/${LIB}/android.hardware.configstore@1.2.so,VNDK,
 /system/${LIB}/android.hardware.confirmationui-support-lib.so,VNDK,
 /system/${LIB}/android.hardware.confirmationui@1.0.so,VNDK,
 /system/${LIB}/android.hardware.contexthub@1.0.so,VNDK,
@@ -58,10 +60,12 @@ Path,Tag,Comments
 /system/${LIB}/android.hardware.fastboot@1.0.so,VNDK,
 /system/${LIB}/android.hardware.gatekeeper@1.0.so,VNDK,
 /system/${LIB}/android.hardware.gnss.measurement_corrections@1.0.so,VNDK,
+/system/${LIB}/android.hardware.gnss.visibility_control@1.0.so,VNDK,
 /system/${LIB}/android.hardware.gnss@1.0.so,VNDK,
 /system/${LIB}/android.hardware.gnss@1.1.so,VNDK,
 /system/${LIB}/android.hardware.gnss@2.0.so,VNDK,
 /system/${LIB}/android.hardware.graphics.allocator@2.0.so,VNDK,
+/system/${LIB}/android.hardware.graphics.allocator@3.0.so,VNDK,
 /system/${LIB}/android.hardware.graphics.bufferqueue@1.0.so,VNDK,
 /system/${LIB}/android.hardware.graphics.bufferqueue@2.0.so,VNDK,
 /system/${LIB}/android.hardware.graphics.common@1.0.so,VNDK-SP,
@@ -72,9 +76,12 @@ Path,Tag,Comments
 /system/${LIB}/android.hardware.graphics.composer@2.3.so,VNDK,
 /system/${LIB}/android.hardware.graphics.mapper@2.0.so,VNDK-SP,
 /system/${LIB}/android.hardware.graphics.mapper@2.1.so,VNDK-SP,
+/system/${LIB}/android.hardware.graphics.mapper@3.0.so,VNDK-SP,
 /system/${LIB}/android.hardware.health.storage@1.0.so,VNDK,
 /system/${LIB}/android.hardware.health@1.0.so,VNDK,
 /system/${LIB}/android.hardware.health@2.0.so,VNDK,
+/system/${LIB}/android.hardware.input.classifier@1.0.so,VNDK,
+/system/${LIB}/android.hardware.input.common@1.0.so,VNDK,
 /system/${LIB}/android.hardware.ir@1.0.so,VNDK,
 /system/${LIB}/android.hardware.keymaster@3.0.so,VNDK,
 /system/${LIB}/android.hardware.keymaster@4.0.so,VNDK,
@@ -90,6 +97,7 @@ Path,Tag,Comments
 /system/${LIB}/android.hardware.neuralnetworks@1.2.so,VNDK,
 /system/${LIB}/android.hardware.nfc@1.0.so,VNDK,
 /system/${LIB}/android.hardware.nfc@1.1.so,VNDK,
+/system/${LIB}/android.hardware.nfc@1.2.so,VNDK,
 /system/${LIB}/android.hardware.oemlock@1.0.so,VNDK,
 /system/${LIB}/android.hardware.power.stats@1.0.so,VNDK,
 /system/${LIB}/android.hardware.power@1.0.so,VNDK,
@@ -107,6 +115,7 @@ Path,Tag,Comments
 /system/${LIB}/android.hardware.radio@1.4.so,VNDK,
 /system/${LIB}/android.hardware.renderscript@1.0.so,VNDK-SP,
 /system/${LIB}/android.hardware.secure_element@1.0.so,VNDK,
+/system/${LIB}/android.hardware.secure_element@1.1.so,VNDK,
 /system/${LIB}/android.hardware.sensors@1.0.so,VNDK,
 /system/${LIB}/android.hardware.sensors@2.0.so,VNDK,
 /system/${LIB}/android.hardware.soundtrigger@2.0-core.so,VNDK,
@@ -119,13 +128,16 @@ Path,Tag,Comments
 /system/${LIB}/android.hardware.thermal@1.1.so,VNDK,
 /system/${LIB}/android.hardware.thermal@2.0.so,VNDK,
 /system/${LIB}/android.hardware.tv.cec@1.0.so,VNDK,
+/system/${LIB}/android.hardware.tv.cec@2.0.so,VNDK,
 /system/${LIB}/android.hardware.tv.input@1.0.so,VNDK,
 /system/${LIB}/android.hardware.usb.gadget@1.0.so,VNDK,
 /system/${LIB}/android.hardware.usb@1.0.so,VNDK,
 /system/${LIB}/android.hardware.usb@1.1.so,VNDK,
+/system/${LIB}/android.hardware.usb@1.2.so,VNDK,
 /system/${LIB}/android.hardware.vibrator@1.0.so,VNDK,
 /system/${LIB}/android.hardware.vibrator@1.1.so,VNDK,
 /system/${LIB}/android.hardware.vibrator@1.2.so,VNDK,
+/system/${LIB}/android.hardware.vibrator@1.3.so,VNDK,
 /system/${LIB}/android.hardware.vr@1.0.so,VNDK,
 /system/${LIB}/android.hardware.weaver@1.0.so,VNDK,
 /system/${LIB}/android.hardware.wifi.hostapd@1.0.so,VNDK,
@@ -160,8 +172,6 @@ Path,Tag,Comments
 /system/${LIB}/extractors/libmpeg2extractor.so,FWK-ONLY,
 /system/${LIB}/extractors/liboggextractor.so,FWK-ONLY,
 /system/${LIB}/extractors/libwavextractor.so,FWK-ONLY,
-/system/${LIB}/hidl.tests.vendor@1.0.so,FWK-ONLY,
-/system/${LIB}/hidl.tests.vendor@1.1.so,FWK-ONLY,
 /system/${LIB}/hw/android.hidl.memory@1.0-impl.so,VNDK-SP,
 /system/${LIB}/hw/audio.a2dp.default.so,FWK-ONLY,
 /system/${LIB}/ld-android.so,LL-NDK-Private,
@@ -180,8 +190,6 @@ Path,Tag,Comments
 /system/${LIB}/libRSDriver.so,VNDK-SP,
 /system/${LIB}/libRS_internal.so,VNDK-SP,
 /system/${LIB}/libRScpp.so,FWK-ONLY,
-/system/${LIB}/libWnnEngDic.so,FWK-ONLY,
-/system/${LIB}/libWnnJpnDic.so,FWK-ONLY,
 /system/${LIB}/libaaudio.so,FWK-ONLY,
 /system/${LIB}/libaaudioservice.so,FWK-ONLY,
 /system/${LIB}/libadbconnection.so,FWK-ONLY,
@@ -265,6 +273,9 @@ Path,Tag,Comments
 /system/${LIB}/libclang_rt.ubsan_standalone-i686-android.so,VNDK,
 /system/${LIB}/libclang_rt.ubsan_standalone-x86_64-android.so,VNDK,
 /system/${LIB}/libcn-cbor.so,VNDK,
+/system/${LIB}/libcodec2.so,VNDK,
+/system/${LIB}/libcodec2_hidl@1.0.so,VNDK,
+/system/${LIB}/libcodec2_vndk.so,VNDK,
 /system/${LIB}/libcompiler_rt.so,VNDK-SP-Private,
 /system/${LIB}/libcrypto.so,VNDK,
 /system/${LIB}/libcrypto_utils.so,VNDK,
@@ -330,20 +341,14 @@ Path,Tag,Comments
 /system/${LIB}/libinputflinger.so,FWK-ONLY,
 /system/${LIB}/libinputservice.so,FWK-ONLY,
 /system/${LIB}/libion.so,VNDK-SP,
-/system/${LIB}/libiperf.so,FWK-ONLY,
 /system/${LIB}/libiprouteutil.so,FWK-ONLY,
 /system/${LIB}/libjavacore.so,FWK-ONLY,
 /system/${LIB}/libjavacrypto.so,FWK-ONLY,
 /system/${LIB}/libjdwp.so,FWK-ONLY,
-/system/${LIB}/libjni_eglfence.so,FWK-ONLY,
-/system/${LIB}/libjni_filtershow_filters.so,FWK-ONLY,
-/system/${LIB}/libjni_jpegstream.so,FWK-ONLY,
-/system/${LIB}/libjni_jpegutil.so,FWK-ONLY,
-/system/${LIB}/libjni_latinime.so,FWK-ONLY,
 /system/${LIB}/libjni_pacprocessor.so,FWK-ONLY,
-/system/${LIB}/libjni_tinyplanet.so,FWK-ONLY,
 /system/${LIB}/libjnigraphics.so,FWK-ONLY,
 /system/${LIB}/libjpeg.so,VNDK,
+/system/${LIB}/libjsoncpp.so,VNDK-SP,
 /system/${LIB}/libkeymaster4support.so,FWK-ONLY,
 /system/${LIB}/libkeymaster_messages.so,VNDK,
 /system/${LIB}/libkeymaster_portable.so,VNDK,
@@ -367,7 +372,6 @@ Path,Tag,Comments
 /system/${LIB}/libmedia_jni.so,FWK-ONLY,
 /system/${LIB}/libmedia_omx.so,VNDK,
 /system/${LIB}/libmediadrm.so,FWK-ONLY,
-/system/${LIB}/libmediaextractor.so,FWK-ONLY,
 /system/${LIB}/libmediaextractorservice.so,FWK-ONLY,
 /system/${LIB}/libmedialogservice.so,FWK-ONLY,
 /system/${LIB}/libmediametrics.so,FWK-ONLY,
@@ -381,14 +385,10 @@ Path,Tag,Comments
 /system/${LIB}/libminikin.so,FWK-ONLY,
 /system/${LIB}/libmkbootimg_abi_check.so,VNDK,
 /system/${LIB}/libmtp.so,FWK-ONLY,
-/system/${LIB}/libnativebridge.so,FWK-ONLY,
-/system/${LIB}/libnativehelper.so,FWK-ONLY,
-/system/${LIB}/libnativeloader.so,FWK-ONLY,
 /system/${LIB}/libnativewindow.so,LL-NDK,
 /system/${LIB}/libnbaio.so,FWK-ONLY,Vendor module should link libnbaio_mono.so
 /system/${LIB}/libnblog.so,FWK-ONLY,
 /system/${LIB}/libnetd_client.so,LL-NDK-Private,
-/system/${LIB}/libnetdaidl.so,FWK-ONLY,
 /system/${LIB}/libnetdutils.so,FWK-ONLY,
 /system/${LIB}/libnetlink.so,FWK-ONLY,
 /system/${LIB}/libnetutils.so,VNDK,
@@ -404,9 +404,7 @@ Path,Tag,Comments
 /system/${LIB}/libopenjdkjvmti.so,FWK-ONLY,
 /system/${LIB}/libopenjdkjvmtid.so,FWK-ONLY,
 /system/${LIB}/libopus.so,VNDK,
-/system/${LIB}/libpac.so,FWK-ONLY,
 /system/${LIB}/libpackagelistparser.so,FWK-ONLY,
-/system/${LIB}/libpagemap.so,VNDK,
 /system/${LIB}/libpcap.so,FWK-ONLY,
 /system/${LIB}/libpcre2.so,VNDK,
 /system/${LIB}/libpcrecpp.so,FWK-ONLY,
@@ -418,7 +416,7 @@ Path,Tag,Comments
 /system/${LIB}/libpower.so,VNDK,
 /system/${LIB}/libpowermanager.so,FWK-ONLY,
 /system/${LIB}/libprintspooler_jni.so,FWK-ONLY,
-/system/${LIB}/libprocessgroup.so,FWK-ONLY,
+/system/${LIB}/libprocessgroup.so,VNDK-SP,
 /system/${LIB}/libprocinfo.so,VNDK,
 /system/${LIB}/libprotobuf-cpp-full.so,VNDK,
 /system/${LIB}/libprotobuf-cpp-lite.so,VNDK,
@@ -449,6 +447,7 @@ Path,Tag,Comments
 /system/${LIB}/libssl.so,VNDK,
 /system/${LIB}/libstagefright.so,FWK-ONLY,
 /system/${LIB}/libstagefright_amrnb_common.so,VNDK,
+/system/${LIB}/libstagefright_bufferpool@2.0.so,VNDK,
 /system/${LIB}/libstagefright_bufferqueue_helper.so,VNDK,
 /system/${LIB}/libstagefright_enc_common.so,VNDK,
 /system/${LIB}/libstagefright_flacdec.so,VNDK,
@@ -482,7 +481,6 @@ Path,Tag,Comments
 /system/${LIB}/libstatslog.so,FWK-ONLY,
 /system/${LIB}/libstdc++.so,FWK-ONLY,
 /system/${LIB}/libsurfaceflinger.so,FWK-ONLY,
-/system/${LIB}/libsurfaceflinger_ddmconnection.so,FWK-ONLY,
 /system/${LIB}/libsuspend.so,FWK-ONLY,
 /system/${LIB}/libsync.so,LL-NDK,
 /system/${LIB}/libsysutils.so,VNDK,
@@ -492,7 +490,7 @@ Path,Tag,Comments
 /system/${LIB}/libtinyxml2.so,VNDK,
 /system/${LIB}/libtombstoned_client.so,FWK-ONLY,
 /system/${LIB}/libui.so,VNDK,
-/system/${LIB}/libunwind.so,VNDK-SP-Private,
+/system/${LIB}/libunwind.so,FWK-ONLY,
 /system/${LIB}/libunwindstack.so,VNDK-SP,
 /system/${LIB}/libusbhost.so,VNDK,
 /system/${LIB}/libutils.so,VNDK-SP,
@@ -509,7 +507,6 @@ Path,Tag,Comments
 /system/${LIB}/libwifi-system.so,FWK-ONLY,
 /system/${LIB}/libwifikeystorehal.so,FWK-ONLY,
 /system/${LIB}/libwilhelm.so,FWK-ONLY,
-/system/${LIB}/libwnndict.so,FWK-ONLY,
 /system/${LIB}/libxml2.so,VNDK,
 /system/${LIB}/libyuv.so,VNDK,
 /system/${LIB}/libz.so,VNDK-SP,
@@ -542,6 +539,7 @@ Path,Tag,Comments
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.biometrics.face@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.biometrics.fingerprint@2.1.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.bluetooth.a2dp@1.0.so,VNDK,
+/system/${LIB}/vndk${VNDK_VER}/android.hardware.bluetooth.audio@2.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.bluetooth@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.boot@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.broadcastradio@1.0.so,VNDK,
@@ -557,12 +555,13 @@ Path,Tag,Comments
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.camera.metadata@3.3.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.camera.metadata@3.4.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.camera.provider@2.4.so,VNDK,
+/system/${LIB}/vndk${VNDK_VER}/android.hardware.camera.provider@2.5.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.cas.native@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.cas@1.0.so,VNDK,
+/system/${LIB}/vndk${VNDK_VER}/android.hardware.cas@1.1.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.configstore-utils.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.configstore@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.configstore@1.1.so,VNDK,
-/system/${LIB}/vndk${VNDK_VER}/android.hardware.configstore@1.2.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.confirmationui-support-lib.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.confirmationui@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.contexthub@1.0.so,VNDK,
@@ -573,10 +572,12 @@ Path,Tag,Comments
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.fastboot@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.gatekeeper@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.gnss.measurement_corrections@1.0.so,VNDK,
+/system/${LIB}/vndk${VNDK_VER}/android.hardware.gnss.visibility_control@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.gnss@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.gnss@1.1.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.gnss@2.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.graphics.allocator@2.0.so,VNDK,
+/system/${LIB}/vndk${VNDK_VER}/android.hardware.graphics.allocator@3.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.graphics.bufferqueue@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.graphics.bufferqueue@2.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.graphics.composer@2.1.so,VNDK,
@@ -585,6 +586,8 @@ Path,Tag,Comments
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.health.storage@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.health@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.health@2.0.so,VNDK,
+/system/${LIB}/vndk${VNDK_VER}/android.hardware.input.classifier@1.0.so,VNDK,
+/system/${LIB}/vndk${VNDK_VER}/android.hardware.input.common@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.ir@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.keymaster@3.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.keymaster@4.0.so,VNDK,
@@ -600,6 +603,7 @@ Path,Tag,Comments
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.neuralnetworks@1.2.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.nfc@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.nfc@1.1.so,VNDK,
+/system/${LIB}/vndk${VNDK_VER}/android.hardware.nfc@1.2.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.oemlock@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.power.stats@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.power@1.0.so,VNDK,
@@ -616,6 +620,7 @@ Path,Tag,Comments
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.radio@1.3.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.radio@1.4.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.secure_element@1.0.so,VNDK,
+/system/${LIB}/vndk${VNDK_VER}/android.hardware.secure_element@1.1.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.sensors@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.sensors@2.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.soundtrigger@2.0-core.so,VNDK,
@@ -628,13 +633,16 @@ Path,Tag,Comments
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.thermal@1.1.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.thermal@2.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.tv.cec@1.0.so,VNDK,
+/system/${LIB}/vndk${VNDK_VER}/android.hardware.tv.cec@2.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.tv.input@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.usb.gadget@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.usb@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.usb@1.1.so,VNDK,
+/system/${LIB}/vndk${VNDK_VER}/android.hardware.usb@1.2.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.vibrator@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.vibrator@1.1.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.vibrator@1.2.so,VNDK,
+/system/${LIB}/vndk${VNDK_VER}/android.hardware.vibrator@1.3.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.vr@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.weaver@1.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/android.hardware.wifi.hostapd@1.0.so,VNDK,
@@ -674,6 +682,9 @@ Path,Tag,Comments
 /system/${LIB}/vndk${VNDK_VER}/libclang_rt.ubsan_standalone-i686-android.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/libclang_rt.ubsan_standalone-x86_64-android.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/libcn-cbor.so,VNDK,
+/system/${LIB}/vndk${VNDK_VER}/libcodec2.so,VNDK,
+/system/${LIB}/vndk${VNDK_VER}/libcodec2_hidl@1.0.so,VNDK,
+/system/${LIB}/vndk${VNDK_VER}/libcodec2_vndk.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/libcrypto.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/libcrypto_utils.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/libcurl.so,VNDK,
@@ -718,6 +729,7 @@ Path,Tag,Comments
 /system/${LIB}/vndk${VNDK_VER}/libsqlite.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/libssl.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/libstagefright_amrnb_common.so,VNDK,
+/system/${LIB}/vndk${VNDK_VER}/libstagefright_bufferpool@2.0.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/libstagefright_bufferqueue_helper.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/libstagefright_enc_common.so,VNDK,
 /system/${LIB}/vndk${VNDK_VER}/libstagefright_flacdec.so,VNDK,
@@ -764,6 +776,7 @@ Path,Tag,Comments
 /system/${LIB}/vndk-sp${VNDK_VER}/android.hardware.graphics.common@1.2.so,VNDK-SP,
 /system/${LIB}/vndk-sp${VNDK_VER}/android.hardware.graphics.mapper@2.0.so,VNDK-SP,
 /system/${LIB}/vndk-sp${VNDK_VER}/android.hardware.graphics.mapper@2.1.so,VNDK-SP,
+/system/${LIB}/vndk-sp${VNDK_VER}/android.hardware.graphics.mapper@3.0.so,VNDK-SP,
 /system/${LIB}/vndk-sp${VNDK_VER}/android.hardware.renderscript@1.0.so,VNDK-SP,
 /system/${LIB}/vndk-sp${VNDK_VER}/android.hidl.memory.token@1.0.so,VNDK-SP,
 /system/${LIB}/vndk-sp${VNDK_VER}/android.hidl.memory@1.0.so,VNDK-SP,
@@ -788,7 +801,9 @@ Path,Tag,Comments
 /system/${LIB}/vndk-sp${VNDK_VER}/libhwbinder.so,VNDK-SP,
 /system/${LIB}/vndk-sp${VNDK_VER}/libhwbinder_noltopgo.so,VNDK-SP,
 /system/${LIB}/vndk-sp${VNDK_VER}/libion.so,VNDK-SP,
+/system/${LIB}/vndk-sp${VNDK_VER}/libjsoncpp.so,VNDK-SP,
 /system/${LIB}/vndk-sp${VNDK_VER}/liblzma.so,VNDK-SP,
+/system/${LIB}/vndk-sp${VNDK_VER}/libprocessgroup.so,VNDK-SP,
 /system/${LIB}/vndk-sp${VNDK_VER}/libunwind.so,VNDK-SP-Private,
 /system/${LIB}/vndk-sp${VNDK_VER}/libunwindstack.so,VNDK-SP,
 /system/${LIB}/vndk-sp${VNDK_VER}/libutils.so,VNDK-SP,