vndk-def: Sort eligible-list-o-release.csv

This commit sorts the lib paths in eligible-list-o-release.csv.
No functionality changes.

Bug: 64503245
Test: ./vndk_definition_tool.py vndk \
  --tag-file datasets/eligible-list-o-release.csv ...

Change-Id: I11c219fe412589ad3d4c764ff1f8b492c2b9335b
Merged-In: I10fe84da7ccf3f14180c5bc6d251d8dc80ed569a
(cherry picked from commit b91a017e70b8a5cac73a14cee6b52c0f89f2dcd4)

1 files changed, 78 insertions, 78 deletions

diff --git a/vndk/tools/definition-tool/datasets/eligible-list-o-release.csv b/vndk/tools/definition-tool/datasets/eligible-list-o-release.csv
index e82721a8a..47854d4ed 100644
--- a/vndk/tools/definition-tool/datasets/eligible-list-o-release.csv
+++ b/vndk/tools/definition-tool/datasets/eligible-list-o-release.csv
@@ -19,8 +19,8 @@ Path,Tag,v3.7
 /system/${LIB}/android.hardware.camera.device@1.0.so,VNDK,
 /system/${LIB}/android.hardware.camera.device@3.2.so,VNDK,
 /system/${LIB}/android.hardware.camera.provider@2.4.so,VNDK,
-/system/${LIB}/android.hardware.cas@1.0.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.configstore-utils.so,VNDK,
 /system/${LIB}/android.hardware.configstore@1.0.so,VNDK,
 /system/${LIB}/android.hardware.configstore@1.1.so,VNDK,
@@ -30,13 +30,10 @@ Path,Tag,v3.7
 /system/${LIB}/android.hardware.gatekeeper@1.0.so,VNDK,
 /system/${LIB}/android.hardware.gnss@1.0.so,VNDK,
 /system/${LIB}/android.hardware.graphics.allocator@2.0.so,VNDK-SP,
-/system/${LIB}/vndk-sp/android.hardware.graphics.allocator@2.0.so,VNDK-SP,
 /system/${LIB}/android.hardware.graphics.bufferqueue@1.0.so,VNDK,
 /system/${LIB}/android.hardware.graphics.common@1.0.so,VNDK-SP,
-/system/${LIB}/vndk-sp/android.hardware.graphics.common@1.0.so,VNDK-SP,
 /system/${LIB}/android.hardware.graphics.composer@2.1.so,VNDK,
 /system/${LIB}/android.hardware.graphics.mapper@2.0.so,VNDK-SP,
-/system/${LIB}/vndk-sp/android.hardware.graphics.mapper@2.0.so,VNDK-SP,
 /system/${LIB}/android.hardware.health@1.0.so,VNDK,
 /system/${LIB}/android.hardware.ir@1.0.so,VNDK,
 /system/${LIB}/android.hardware.keymaster@3.0.so,VNDK,
@@ -52,9 +49,9 @@ Path,Tag,v3.7
 /system/${LIB}/android.hardware.radio@1.0.so,VNDK,
 /system/${LIB}/android.hardware.radio@1.1.so,VNDK,
 /system/${LIB}/android.hardware.renderscript@1.0.so,VNDK-SP,
-/system/${LIB}/vndk-sp/android.hardware.renderscript@1.0.so,VNDK-SP,
 /system/${LIB}/android.hardware.sensors@1.0.so,VNDK,
 /system/${LIB}/android.hardware.soundtrigger@2.0.so,VNDK,
+/system/${LIB}/android.hardware.tests.libhwbinder@1.0.so,VNDK,
 /system/${LIB}/android.hardware.tetheroffload.config@1.0.so,VNDK,
 /system/${LIB}/android.hardware.tetheroffload.control@1.0.so,VNDK,
 /system/${LIB}/android.hardware.thermal@1.0.so,VNDK,
@@ -72,24 +69,41 @@ Path,Tag,v3.7
 /system/${LIB}/android.hardware.wifi@1.1.so,VNDK,
 /system/${LIB}/android.hidl.allocator@1.0.so,VNDK,
 /system/${LIB}/android.hidl.base@1.0.so,VNDK-SP,
-/system/${LIB}/vndk-sp/android.hidl.base@1.0.so,VNDK-SP,
 /system/${LIB}/android.hidl.manager@1.0.so,VNDK,
-/system/${LIB}/vndk-sp/android.hidl.memory@1.0-impl.so,VNDK-SP-Indirect-Private,
 /system/${LIB}/android.hidl.memory@1.0.so,VNDK-SP,
-/system/${LIB}/vndk-sp/android.hidl.memory@1.0.so,VNDK-SP,
 /system/${LIB}/android.hidl.token@1.0-utils.so,VNDK,
 /system/${LIB}/android.hidl.token@1.0.so,VNDK,
 /system/${LIB}/android.system.wifi.keystore@1.0.so,VNDK,
+/system/${LIB}/drm/libfwdlockengine.so,FWK-ONLY,
 /system/${LIB}/hw/audio.a2dp.default.so,FWK-ONLY,
 /system/${LIB}/hw/bluetooth.default.so,FWK-ONLY,
 /system/${LIB}/hw/keystore.default.so,FWK-ONLY,
 /system/${LIB}/ld-android.so,LL-NDK-Indirect,
+/system/${LIB}/libEGL.so,SP-NDK,
+/system/${LIB}/libETC1.so,FWK-ONLY,
+/system/${LIB}/libFFTEm.so,FWK-ONLY,
+/system/${LIB}/libGLESv1_CM.so,SP-NDK,
+/system/${LIB}/libGLESv1_enc.so,FWK-ONLY,
+/system/${LIB}/libGLESv2.so,SP-NDK,
+/system/${LIB}/libGLESv2_enc.so,FWK-ONLY,
+/system/${LIB}/libGLESv3.so,SP-NDK,
+/system/${LIB}/libLLVM.so,VNDK-SP-Indirect-Private,
+/system/${LIB}/libOpenMAXAL.so,FWK-ONLY,
+/system/${LIB}/libOpenSLES.so,FWK-ONLY,
+/system/${LIB}/libOpenglSystemCommon.so,FWK-ONLY,
+/system/${LIB}/libRS.so,FWK-ONLY,
+/system/${LIB}/libRSCpuRef.so,VNDK-SP,
+/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}/lib_renderControl_enc.so,FWK-ONLY,
 /system/${LIB}/libaaudio.so,FWK-ONLY,
+/system/${LIB}/libandroid.so,FWK-ONLY,
 /system/${LIB}/libandroid_net.so,LL-NDK,
 /system/${LIB}/libandroid_runtime.so,FWK-ONLY,
 /system/${LIB}/libandroid_servers.so,FWK-ONLY,
-/system/${LIB}/libandroid.so,FWK-ONLY,
 /system/${LIB}/libandroidfw.so,FWK-ONLY,
 /system/${LIB}/libappfuse.so,FWK-ONLY,
 /system/${LIB}/libart-compiler.so,FWK-ONLY,
@@ -105,63 +119,49 @@ Path,Tag,v3.7
 /system/${LIB}/libaudiopolicymanager.so,FWK-ONLY,
 /system/${LIB}/libaudiopolicymanagerdefault.so,FWK-ONLY,
 /system/${LIB}/libaudiopolicyservice.so,FWK-ONLY,
-/system/${LIB}/soundfx/libaudiopreprocessing.so,FWK-ONLY,
 /system/${LIB}/libaudioprocessing.so,FWK-ONLY,
 /system/${LIB}/libaudioroute.so,VNDK,
 /system/${LIB}/libaudiospdif.so,FWK-ONLY,
 /system/${LIB}/libaudioutils.so,VNDK,
 /system/${LIB}/libavservices_minijail.so,VNDK,
 /system/${LIB}/libbacktrace.so,VNDK-SP-Indirect,
-/system/${LIB}/vndk-sp/libbacktrace.so,VNDK-SP-Indirect,
 /system/${LIB}/libbase.so,VNDK-SP,
-/system/${LIB}/vndk-sp/libbase.so,VNDK-SP,
 /system/${LIB}/libbatteryservice.so,FWK-ONLY,
 /system/${LIB}/libbcc.so,FWK-ONLY,
 /system/${LIB}/libbcinfo.so,VNDK-SP,
-/system/${LIB}/vndk-sp/libbcinfo.so,VNDK-SP,
 /system/${LIB}/libbinder.so,VNDK,
 /system/${LIB}/libbinderwrapper.so,FWK-ONLY,
 /system/${LIB}/libblas.so,VNDK-SP-Indirect-Private,
-/system/${LIB}/vndk-sp/libblas.so,VNDK-SP-Indirect-Private,
 /system/${LIB}/libbluetooth_jni.so,FWK-ONLY,
 /system/${LIB}/libbrillo-binder.so,FWK-ONLY,
 /system/${LIB}/libbrillo-stream.so,FWK-ONLY,
 /system/${LIB}/libbrillo.so,FWK-ONLY,
-/system/${LIB}/soundfx/libbundlewrapper.so,FWK-ONLY,
-/system/${LIB}/libc_malloc_debug.so,LL-NDK-Indirect,
-/system/${LIB}/libc.so,LL-NDK,
 /system/${LIB}/libc++.so,VNDK-SP,
-/system/${LIB}/vndk-sp/libc++.so,VNDK-SP,
+/system/${LIB}/libc.so,LL-NDK,
+/system/${LIB}/libc_malloc_debug.so,LL-NDK-Indirect,
+/system/${LIB}/libcamera2ndk.so,FWK-ONLY,
 /system/${LIB}/libcamera_client.so,FWK-ONLY,
 /system/${LIB}/libcamera_metadata.so,VNDK,
-/system/${LIB}/libcamera2ndk.so,FWK-ONLY,
 /system/${LIB}/libcameraservice.so,FWK-ONLY,
 /system/${LIB}/libcap.so,VNDK,
 /system/${LIB}/libchrome.so,FWK-ONLY,
 /system/${LIB}/libcld80211.so,VND-ONLY,
-/vendor/${LIB}/libcld80211.so,VND-ONLY,
 /system/${LIB}/libcompiler_rt.so,VNDK-SP-Indirect-Private,
-/system/${LIB}/vndk-sp/libcompiler_rt.so,VNDK-SP-Indirect-Private,
-/system/${LIB}/libcrypto_utils.so,VNDK,
 /system/${LIB}/libcrypto.so,VNDK,
+/system/${LIB}/libcrypto_utils.so,VNDK,
 /system/${LIB}/libcups.so,FWK-ONLY,
 /system/${LIB}/libcurl.so,VNDK,
 /system/${LIB}/libcutils.so,VNDK-SP,
-/system/${LIB}/vndk-sp/libcutils.so,VNDK-SP,
 /system/${LIB}/libdebuggerd_client.so,FWK-ONLY,
 /system/${LIB}/libdefcontainer_jni.so,FWK-ONLY,
 /system/${LIB}/libdiskconfig.so,VNDK,
 /system/${LIB}/libdl.so,LL-NDK,
 /system/${LIB}/libdng_sdk.so,FWK-ONLY,
-/system/${LIB}/soundfx/libdownmix.so,FWK-ONLY,
-/system/${LIB}/libdrmframework_jni.so,FWK-ONLY,
 /system/${LIB}/libdrmframework.so,FWK-ONLY,
+/system/${LIB}/libdrmframework_jni.so,FWK-ONLY,
 /system/${LIB}/libdumpstateaidl.so,FWK-ONLY,
 /system/${LIB}/libdumpstateutil.so,VNDK,
-/system/${LIB}/soundfx/libeffectproxy.so,FWK-ONLY,
 /system/${LIB}/libeffects.so,FWK-ONLY,
-/system/${LIB}/libEGL.so,SP-NDK,
-/system/${LIB}/libETC1.so,FWK-ONLY,
 /system/${LIB}/libevent.so,VNDK,
 /system/${LIB}/libexif.so,VNDK,
 /system/${LIB}/libexpat.so,VNDK,
@@ -173,37 +173,24 @@ Path,Tag,v3.7
 /system/${LIB}/libext2fs.so,FWK-ONLY,
 /system/${LIB}/libext4_utils.so,FWK-ONLY,
 /system/${LIB}/libf2fs_sparseblock.so,FWK-ONLY,
-/system/${LIB}/libFFTEm.so,FWK-ONLY,
 /system/${LIB}/libfilterfw.so,FWK-ONLY,
 /system/${LIB}/libfilterpack_imageproc.so,FWK-ONLY,
 /system/${LIB}/libfmq.so,VNDK,
 /system/${LIB}/libframesequence.so,FWK-ONLY,
 /system/${LIB}/libft2.so,FWK-ONLY-RS,
-/system/${LIB}/drm/libfwdlockengine.so,FWK-ONLY,
 /system/${LIB}/libgatekeeper.so,VNDK,
 /system/${LIB}/libgiftranscode.so,FWK-ONLY,
-/system/${LIB}/libGLESv1_CM.so,SP-NDK,
-/system/${LIB}/libGLESv1_enc.so,FWK-ONLY,
-/system/${LIB}/libGLESv2_enc.so,FWK-ONLY,
-/system/${LIB}/libGLESv2.so,SP-NDK,
-/system/${LIB}/libGLESv3.so,SP-NDK,
 /system/${LIB}/libgui.so,VNDK,
-/system/${LIB}/libhardware_legacy.so,VNDK,
 /system/${LIB}/libhardware.so,VNDK-SP,
-/system/${LIB}/vndk-sp/libhardware.so,VNDK-SP,
+/system/${LIB}/libhardware_legacy.so,VNDK,
 /system/${LIB}/libharfbuzz_ng.so,FWK-ONLY,
 /system/${LIB}/libhidcommand_jni.so,FWK-ONLY,
 /system/${LIB}/libhidl-gen-utils.so,FWK-ONLY,
 /system/${LIB}/libhidlbase.so,VNDK-SP,
-/system/${LIB}/vndk-sp/libhidlbase.so,VNDK-SP,
 /system/${LIB}/libhidlmemory.so,VNDK-SP,
-/system/${LIB}/vndk-sp/libhidlmemory.so,VNDK-SP,
 /system/${LIB}/libhidltransport.so,VNDK-SP,
-/system/${LIB}/vndk-sp/libhidltransport.so,VNDK-SP,
 /system/${LIB}/libhwbinder.so,VNDK-SP,
-/system/${LIB}/vndk-sp/libhwbinder.so,VNDK-SP,
 /system/${LIB}/libhwc2on1adapter.so,VND-ONLY,
-/vendor/${LIB}/libhwc2on1adapter.so,VND-ONLY,
 /system/${LIB}/libhwui.so,FWK-ONLY,
 /system/${LIB}/libicui18n.so,VNDK,
 /system/${LIB}/libicuuc.so,VNDK,
@@ -213,7 +200,6 @@ Path,Tag,v3.7
 /system/${LIB}/libinputflinger.so,FWK-ONLY,
 /system/${LIB}/libinputservice.so,FWK-ONLY,
 /system/${LIB}/libion.so,VNDK-SP,
-/system/${LIB}/vndk-sp/libion.so,VNDK-SP,
 /system/${LIB}/libiperf.so,FWK-ONLY,
 /system/${LIB}/libiprouteutil.so,FWK-ONLY,
 /system/${LIB}/libjavacore.so,FWK-ONLY,
@@ -227,28 +213,24 @@ Path,Tag,v3.7
 /system/${LIB}/libjni_tinyplanet.so,FWK-ONLY,
 /system/${LIB}/libjnigraphics.so,FWK-ONLY,
 /system/${LIB}/libjpeg.so,VNDK,
+/system/${LIB}/libkeymaster1.so,VNDK,
 /system/${LIB}/libkeymaster_messages.so,VNDK,
 /system/${LIB}/libkeymaster_portable.so,VNDK,
 /system/${LIB}/libkeymaster_staging.so,VNDK,
-/system/${LIB}/libkeymaster1.so,VNDK,
-/system/${LIB}/libkeystore_binder.so,FWK-ONLY,
 /system/${LIB}/libkeystore-engine.so,FWK-ONLY,
+/system/${LIB}/libkeystore_binder.so,FWK-ONLY,
 /system/${LIB}/libldacBT_abr.so,VNDK,
 /system/${LIB}/libldacBT_enc.so,VNDK,
-/system/${LIB}/soundfx/libldnhncr.so,FWK-ONLY,
-/system/${LIB}/libLLVM.so,VNDK-SP-Indirect-Private,
-/system/${LIB}/vndk-sp/libLLVM.so,VNDK-SP-Indirect-Private,
 /system/${LIB}/liblog.so,LL-NDK,
 /system/${LIB}/liblogcat.so,FWK-ONLY,
 /system/${LIB}/liblogwrap.so,FWK-ONLY,
 /system/${LIB}/liblz4.so,VNDK,
 /system/${LIB}/liblzma.so,VNDK-SP-Indirect,
-/system/${LIB}/vndk-sp/liblzma.so,VNDK-SP-Indirect,
 /system/${LIB}/libm.so,LL-NDK,
 /system/${LIB}/libmdnssd.so,FWK-ONLY,
+/system/${LIB}/libmedia.so,FWK-ONLY,
 /system/${LIB}/libmedia_helper.so,VNDK,
 /system/${LIB}/libmedia_jni.so,FWK-ONLY,
-/system/${LIB}/libmedia.so,FWK-ONLY,
 /system/${LIB}/libmedia_omx.so,VNDK,
 /system/${LIB}/libmediadrm.so,FWK-ONLY,
 /system/${LIB}/libmediaextractorservice.so,FWK-ONLY,
@@ -268,18 +250,14 @@ Path,Tag,v3.7
 /system/${LIB}/libnativeloader.so,FWK-ONLY,
 /system/${LIB}/libnativewindow.so,SP-NDK,
 /system/${LIB}/libnbaio.so,VNDK,
-/vendor/${LIB}/libnbaio_mono.so,VND-ONLY,
 /system/${LIB}/libnetd_client.so,LL-NDK-Indirect,
 /system/${LIB}/libnetdaidl.so,FWK-ONLY,
 /system/${LIB}/libnetlink.so,FWK-ONLY,
 /system/${LIB}/libnetutils.so,VNDK,
 /system/${LIB}/libnl.so,VNDK,
-/system/${LIB}/libOpenglSystemCommon.so,FWK-ONLY,
 /system/${LIB}/libopenjdk.so,FWK-ONLY,
 /system/${LIB}/libopenjdkjvm.so,FWK-ONLY,
 /system/${LIB}/libopenjdkjvmti.so,FWK-ONLY,
-/system/${LIB}/libOpenMAXAL.so,FWK-ONLY,
-/system/${LIB}/libOpenSLES.so,FWK-ONLY,
 /system/${LIB}/libopus.so,FWK-ONLY,
 /system/${LIB}/libpac.so,FWK-ONLY,
 /system/${LIB}/libpackagelistparser.so,FWK-ONLY,
@@ -298,25 +276,13 @@ Path,Tag,v3.7
 /system/${LIB}/libprocinfo.so,VNDK,
 /system/${LIB}/libprotobuf-cpp-full.so,VNDK,
 /system/${LIB}/libprotobuf-cpp-lite.so,VNDK,
-/system/${LIB}/libradio_metadata.so,VNDK,
 /system/${LIB}/libradio.so,FWK-ONLY,
+/system/${LIB}/libradio_metadata.so,VNDK,
 /system/${LIB}/libradioservice.so,FWK-ONLY,
 /system/${LIB}/libreference-ril.so,VND-ONLY,
-/vendor/${LIB}/libreference-ril.so,VND-ONLY,
-/system/${LIB}/soundfx/libreverbwrapper.so,FWK-ONLY,
 /system/${LIB}/libril.so,VND-ONLY,
-/vendor/${LIB}/libril.so,VND-ONLY,
 /system/${LIB}/librilutils.so,VND-ONLY,
-/vendor/${LIB}/librilutils.so,VND-ONLY,
-/system/${LIB}/libRS_internal.so,VNDK-SP,
-/system/${LIB}/vndk-sp/libRS_internal.so,VNDK-SP,
 /system/${LIB}/librs_jni.so,FWK-ONLY,
-/system/${LIB}/libRS.so,FWK-ONLY,
-/system/${LIB}/libRScpp.so,FWK-ONLY,
-/system/${LIB}/libRSCpuRef.so,VNDK-SP,
-/system/${LIB}/vndk-sp/libRSCpuRef.so,VNDK-SP,
-/system/${LIB}/libRSDriver.so,VNDK-SP,
-/system/${LIB}/vndk-sp/libRSDriver.so,VNDK-SP,
 /system/${LIB}/librtp_jni.so,FWK-ONLY,
 /system/${LIB}/libschedulerservicehidl.so,FWK-ONLY,
 /system/${LIB}/libselinux.so,FWK-ONLY,
@@ -338,6 +304,7 @@ Path,Tag,v3.7
 /system/${LIB}/libspeexresampler.so,VNDK,
 /system/${LIB}/libsqlite.so,VNDK,
 /system/${LIB}/libssl.so,VNDK,
+/system/${LIB}/libstagefright.so,FWK-ONLY,
 /system/${LIB}/libstagefright_amrnb_common.so,FWK-ONLY,
 /system/${LIB}/libstagefright_enc_common.so,FWK-ONLY,
 /system/${LIB}/libstagefright_foundation.so,VNDK,
@@ -364,46 +331,79 @@ Path,Tag,v3.7
 /system/${LIB}/libstagefright_soft_vpxdec.so,FWK-ONLY,
 /system/${LIB}/libstagefright_soft_vpxenc.so,FWK-ONLY,
 /system/${LIB}/libstagefright_xmlparser@1.0.so,FWK-ONLY,
-/system/${LIB}/libstagefright.so,FWK-ONLY,
 /system/${LIB}/libstdc++.so,LL-NDK,
-/system/${LIB}/libsurfaceflinger_ddmconnection.so,FWK-ONLY,
 /system/${LIB}/libsurfaceflinger.so,FWK-ONLY,
+/system/${LIB}/libsurfaceflinger_ddmconnection.so,FWK-ONLY,
 /system/${LIB}/libsuspend.so,VNDK,
 /system/${LIB}/libsync.so,SP-NDK,
 /system/${LIB}/libsysutils.so,VNDK,
 /system/${LIB}/libtextclassifier.so,FWK-ONLY,
 /system/${LIB}/libtinyalsa.so,VNDK,
 /system/${LIB}/libtinycompress.so,VND-ONLY,
-/vendor/${LIB}/libtinycompress.so,VND-ONLY,
 /system/${LIB}/libtinyxml2.so,VNDK,
 /system/${LIB}/libui.so,VNDK,
 /system/${LIB}/libunwind.so,VNDK-SP-Indirect,
-/system/${LIB}/vndk-sp/libunwind.so,VNDK-SP-Indirect,
 /system/${LIB}/libusbhost.so,VNDK,
 /system/${LIB}/libutils.so,VNDK-SP,
-/system/${LIB}/vndk-sp/libutils.so,VNDK-SP,
 /system/${LIB}/libvintf.so,FWK-ONLY,
-/system/${LIB}/soundfx/libvisualizer.so,FWK-ONLY,
 /system/${LIB}/libvixl-arm.so,VNDK,
 /system/${LIB}/libvixl-arm64.so,VNDK,
 /system/${LIB}/libvndksupport.so,LL-NDK,
 /system/${LIB}/libvorbisidec.so,FWK-ONLY,
 /system/${LIB}/libvulkan.so,SP-NDK,
 /system/${LIB}/libwebrtc_audio_preprocessing.so,VND-ONLY,
-/vendor/${LIB}/libwebrtc_audio_preprocessing.so,VND-ONLY,
 /system/${LIB}/libwebviewchromium_loader.so,FWK-ONLY,
 /system/${LIB}/libwebviewchromium_plat_support.so,FWK-ONLY,
 /system/${LIB}/libwfds.so,FWK-ONLY,
 /system/${LIB}/libwifi-service.so,FWK-ONLY,
-/system/${LIB}/libwifi-system.so,FWK-ONLY,
 /system/${LIB}/libwifi-system-iface.so,VNDK,
+/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}/libWnnEngDic.so,FWK-ONLY,
-/system/${LIB}/libWnnJpnDic.so,FWK-ONLY,
 /system/${LIB}/libxml2.so,VNDK,
 /system/${LIB}/libyuv.so,VNDK,
 /system/${LIB}/libz.so,LL-NDK,
 /system/${LIB}/libziparchive.so,VNDK,
-/system/${LIB}/android.hardware.tests.libhwbinder@1.0.so,VNDK,
+/system/${LIB}/soundfx/libaudiopreprocessing.so,FWK-ONLY,
+/system/${LIB}/soundfx/libbundlewrapper.so,FWK-ONLY,
+/system/${LIB}/soundfx/libdownmix.so,FWK-ONLY,
+/system/${LIB}/soundfx/libeffectproxy.so,FWK-ONLY,
+/system/${LIB}/soundfx/libldnhncr.so,FWK-ONLY,
+/system/${LIB}/soundfx/libreverbwrapper.so,FWK-ONLY,
+/system/${LIB}/soundfx/libvisualizer.so,FWK-ONLY,
+/system/${LIB}/vndk-sp/android.hardware.graphics.allocator@2.0.so,VNDK-SP,
+/system/${LIB}/vndk-sp/android.hardware.graphics.common@1.0.so,VNDK-SP,
+/system/${LIB}/vndk-sp/android.hardware.graphics.mapper@2.0.so,VNDK-SP,
+/system/${LIB}/vndk-sp/android.hardware.renderscript@1.0.so,VNDK-SP,
+/system/${LIB}/vndk-sp/android.hidl.base@1.0.so,VNDK-SP,
+/system/${LIB}/vndk-sp/android.hidl.memory@1.0-impl.so,VNDK-SP-Indirect-Private,
+/system/${LIB}/vndk-sp/android.hidl.memory@1.0.so,VNDK-SP,
+/system/${LIB}/vndk-sp/libLLVM.so,VNDK-SP-Indirect-Private,
+/system/${LIB}/vndk-sp/libRSCpuRef.so,VNDK-SP,
+/system/${LIB}/vndk-sp/libRSDriver.so,VNDK-SP,
+/system/${LIB}/vndk-sp/libRS_internal.so,VNDK-SP,
+/system/${LIB}/vndk-sp/libbacktrace.so,VNDK-SP-Indirect,
+/system/${LIB}/vndk-sp/libbase.so,VNDK-SP,
+/system/${LIB}/vndk-sp/libbcinfo.so,VNDK-SP,
+/system/${LIB}/vndk-sp/libblas.so,VNDK-SP-Indirect-Private,
+/system/${LIB}/vndk-sp/libc++.so,VNDK-SP,
+/system/${LIB}/vndk-sp/libcompiler_rt.so,VNDK-SP-Indirect-Private,
+/system/${LIB}/vndk-sp/libcutils.so,VNDK-SP,
+/system/${LIB}/vndk-sp/libhardware.so,VNDK-SP,
+/system/${LIB}/vndk-sp/libhidlbase.so,VNDK-SP,
+/system/${LIB}/vndk-sp/libhidlmemory.so,VNDK-SP,
+/system/${LIB}/vndk-sp/libhidltransport.so,VNDK-SP,
+/system/${LIB}/vndk-sp/libhwbinder.so,VNDK-SP,
+/system/${LIB}/vndk-sp/libion.so,VNDK-SP,
+/system/${LIB}/vndk-sp/liblzma.so,VNDK-SP-Indirect,
+/system/${LIB}/vndk-sp/libunwind.so,VNDK-SP-Indirect,
+/system/${LIB}/vndk-sp/libutils.so,VNDK-SP,
+/vendor/${LIB}/libcld80211.so,VND-ONLY,
+/vendor/${LIB}/libhwc2on1adapter.so,VND-ONLY,
+/vendor/${LIB}/libnbaio_mono.so,VND-ONLY,
+/vendor/${LIB}/libreference-ril.so,VND-ONLY,
+/vendor/${LIB}/libril.so,VND-ONLY,
+/vendor/${LIB}/librilutils.so,VND-ONLY,
+/vendor/${LIB}/libtinycompress.so,VND-ONLY,
+/vendor/${LIB}/libwebrtc_audio_preprocessing.so,VND-ONLY,