From 06761c5d4b2d24e1067c1a322c68dcea898fcc51 Mon Sep 17 00:00:00 2001 From: liangxinyan Date: Sat, 6 Sep 2025 08:26:07 +0800 Subject: [PATCH 01/13] IssueNo: https://gitee.com/openharmony/developtools_integration_verification/issues/ICIF1H Signed-off-by: liangxinyan --- .../rules/ChipsetSDK/chipsetsdk_info.json | 703 +++--------------- .../chipsetsdk_sp_indirect_info.json | 114 ++- .../ChipsetsdkSP/chipsetsdk_sp_info.json | 180 +++-- .../passthrough_indirect_info.json | 74 +- .../rules/Passthrough/passthrough_info.json | 120 +-- tools/deps_guard/rules/dep_whitelist.json | 310 ++++++++ .../rules_checker/base_innerapi_rule.py | 17 +- tools/deps_guard/rules_checker/base_rule.py | 34 +- tools/deps_guard/rules_checker/chipsetsdk.py | 32 +- .../deps_guard/rules_checker/chipsetsdk_sp.py | 64 +- tools/deps_guard/rules_checker/llndk.py | 16 +- tools/deps_guard/rules_checker/passthrough.py | 60 +- 12 files changed, 845 insertions(+), 879 deletions(-) create mode 100644 tools/deps_guard/rules/dep_whitelist.json diff --git a/tools/deps_guard/rules/ChipsetSDK/chipsetsdk_info.json b/tools/deps_guard/rules/ChipsetSDK/chipsetsdk_info.json index 4996339..f8692b6 100644 --- a/tools/deps_guard/rules/ChipsetSDK/chipsetsdk_info.json +++ b/tools/deps_guard/rules/ChipsetSDK/chipsetsdk_info.json @@ -1,703 +1,212 @@ [ { - "name": "build_framework:musl-libc.so", - "so_file_name": "libc.so", - "path": "//build/common/musl:musl-libc.so", + "name": "thirdparty:libssl_shared", + "so_file_name": "libssl_openssl.z.so", + "path": "//third_party/openssl:libssl_shared", "headers": [] }, { - "name": "build_framework:musl-libc.so", - "so_file_name": "ld-musl-arm.so.1", - "path": "//build/common/musl:musl-libc.so", + "name": "hdf:libmap_data_sequenceable_1.0", + "so_file_name": "libmap_data_sequenceable_1.0.z.so", + "path": "//drivers/interface/camera/sequenceable/map_data:libmap_data_sequenceable_1.0", "headers": [] }, { - "name": "build_framework:musl-libc.so", - "so_file_name": "ld-musl-aarch64.so.1", - "path": "//build/common/musl:musl-libc.so", + "name": "hdf:libpower_proxy_1.2", + "so_file_name": "libpower_proxy_1.2.z.so", + "path": "//drivers/interface/power/v1_2:libpower_proxy_1.2", "headers": [] }, { - "name": "build_framework:musl-libc.so", - "so_file_name": "ld-musl-arm-asan.so.1", - "path": "//build/common/musl:musl-libc.so", + "name": "hdf:metadata", + "so_file_name": "libmetadata.z.so", + "path": "//drivers/interface/camera/metadata:metadata", "headers": [] }, { - "name": "build_framework:musl-libc.so", - "so_file_name": "ld-musl-aarch64-asan.so.1", - "path": "//build/common/musl:musl-libc.so", + "name": "hdf:libdisplay_buffer_hdi_impl_v1_1", + "so_file_name": "libdisplay_buffer_hdi_impl_v1_1.z.so", + "path": "//drivers/interface/display/buffer/v1_1:libdisplay_buffer_hdi_impl_v1_1", "headers": [] }, { - "name": "build_framework:musl-libcxx.so", - "so_file_name": "libc++.so", - "path": "//build/common/musl:musl-libcxx.so", + "name": "security:libaccesstoken_sdk", + "so_file_name": "libaccesstoken_sdk.z.so", + "path": "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", "headers": [] }, { - "name": "hilog:libhilog", - "so_file_name": "libhilog.so", - "path": "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "headers": [ - "//base/hiviewdfx/hilog/interfaces/native/innerkits/include/" - ] - }, - { - "name": "hisysevent:libhisysevent", - "so_file_name": "libhisysevent.z.so", - "path": "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent:libhisysevent", - "headers": [ - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include/" - ] - }, - { - "name": "hicollie:libhicollie", - "so_file_name": "libhicollie.z.so", - "path": "//base/hiviewdfx/hicollie/interfaces/native/innerkits:libhicollie", - "headers": [ - "//base/hiviewdfx/hicollie/interfaces/native/innerkits/include/" - ] - }, - { - "name": "selinux_adapter:libservice_checker", - "so_file_name": "libservice_checker.z.so", - "path": "//base/security/selinux_adapter:libservice_checker", - "headers": [ - "//base/security/selinux_adapter/interfaces/policycoreutils/include/", - "//third_party/selinux/libselinux/include/" - ] - }, - { - "name": "init:libbegetutil", - "so_file_name": "libbegetutil.z.so", - "path": "//base/startup/init/interfaces/innerkits:libbegetutil", - "headers": [ - "//base/startup/init/interfaces/innerkits/include/", - "//base/startup/init/interfaces/innerkits/include/syspara/", - "//base/startup/init/interfaces/innerkits/include/token/", - "//base/startup/init/services/include/", - "//base/startup/init/services/include/param/" - ] - }, - { - "name": "init:libbeget_proxy", - "so_file_name": "libbeget_proxy.z.so", - "path": "//base/startup/init/interfaces/innerkits:libbeget_proxy", - "headers": [ - "//base/startup/init/interfaces/innerkits/include/", - "//base/startup/init/interfaces/innerkits/include/syspara/", - "//base/startup/init/interfaces/innerkits/include/token/", - "//base/startup/init/services/include/", - "//base/startup/init/services/include/param/" - ] - }, - { - "name": "c_utils:utils", - "so_file_name": "libutils.z.so", - "path": "//commonlibrary/c_utils/base:utils", - "headers": [ - "//commonlibrary/c_utils/base/include/", - "//third_party/bounds_checking_function/include/" - ] - }, - { - "name": "bounds_checking_function:libsec_shared", - "so_file_name": "libsec_shared.z.so", - "path": "//third_party/bounds_checking_function:libsec_shared", - "headers": [ - "//third_party/bounds_checking_function/include/" - ] - }, - { - "name": "hdf_core:libhdi", - "so_file_name": "libhdi.z.so", - "path": "//drivers/hdf_core/adapter/uhdf2/hdi:libhdi", - "headers": [ - "//drivers/hdf_core/interfaces/inner_api/hdi/", - "//drivers/hdf_core/interfaces/inner_api/hdi/base/", - "//drivers/hdf_core/interfaces/inner_api/core/" - ] - }, - { - "name": "hdf_core:libpub_utils", - "so_file_name": "libpub_utils.z.so", - "path": "//drivers/hdf_core/adapter/uhdf2/pub_utils:libpub_utils", - "headers": [ - "//drivers/hdf_core/interfaces/inner_api/osal/shared/", - "//drivers/hdf_core/interfaces/inner_api/osal/uhdf/", - "//drivers/hdf_core/interfaces/inner_api/utils/", - "//drivers/hdf_core/interfaces/inner_api/core/" - ] - }, - { - "name": "hdf_core:libhdf_ipc_adapter", - "so_file_name": "libhdf_ipc_adapter.z.so", - "path": "//drivers/hdf_core/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "headers": [ - "//drivers/hdf_core/interfaces/inner_api/ipc/", - "//drivers/hdf_core/interfaces/inner_api/core/" - ] - }, - { - "name": "ipc:ipc_single", - "so_file_name": "libipc_single.z.so", - "path": "//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single", - "headers": [ - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include/", - "//foundation/communication/ipc/ipc/native/src/core/include/", - "//foundation/communication/ipc/ipc/native/src/mock/include/", - "//commonlibrary/c_utils/base/include/" - ] - }, - { - "name": "drivers_interface_display:libhdifd_parcelable", - "so_file_name": "libhdifd_parcelable.z.so", - "path": "//drivers/interface/display/composer/hdifd_parcelable:libhdifd_parcelable", - "headers": [ - "//drivers/interface/display/composer/hdifd_parcelable/" - ] - }, - { - "name": "config_policy:configpolicy_util", - "so_file_name": "libconfigpolicy_util.z.so", - "path": "//base/customization/config_policy/frameworks/config_policy:configpolicy_util", - "headers": [ "//base/customization/config_policy/interfaces/inner_api/include/" ] - }, - { - "name": "build_framework:libstd.dylib", - "so_file_name": "libstd.dylib.so", - "path": "//build/rust:libstd.dylib.so", - "headers": [] - }, - { - "name": "faultloggerd:libbacktrace_local", - "so_file_name": "libbacktrace_local.so", - "path": "//base/hiviewdfx/faultloggerd/interfaces/innerkits/backtrace:libbacktrace_local", - "headers": [ "//base/hiviewdfx/faultloggerd/interfaces/innerkits/backtrace/include/" ] - }, - { - "name": "libdrm:libdrm", - "so_file_name": "libdrm.so", - "path": "//third_party/libdrm:libdrm", - "headers": [ - "//third_party/libdrm/", - "//third_party/libdrm/include/", - "//third_party/libdrm/include/drm/" - ] - }, - { - "name": "libpng:libpng", - "so_file_name": "libpng.z.so", - "path": "//third_party/libpng:libpng", + "name": "hdf:libsensor_proxy_3.0", + "so_file_name": "libsensor_proxy_3.0.z.so", + "path": "//drivers/interface/sensor/v3_0:libsensor_proxy_3.0", "headers": [] }, { - "name": "libxml2:xml2", - "so_file_name": "libxml2.z.so", - "path": "//third_party/libxml2:xml2", - "headers": [ - "//third_party/libxml2/include/" - ] + "name": "communication:btcommon", + "so_file_name": "libbtcommon.z.so", + "path": "//foundation/communication/bluetooth/frameworks/inner:btcommon", + "headers": [] }, { - "name": "libexif:libexif", + "name": "thirdparty:libexif", "so_file_name": "libexif.z.so", "path": "//third_party/libexif:libexif", - "headers": [ "//third_party/libexif/" ] - }, - { - "name": "cJSON:cjson", - "so_file_name": "libcjson.z.so", - "path": "//third_party/cJSON:cjson", - "headers": [ - "//third_party/cJSON/" - ] - }, - { - "name": "jsoncpp:jsoncpp", - "so_file_name": "libjsoncpp.z.so", - "path": "//third_party/jsoncpp:jsoncpp", - "headers": [ - "//third_party/jsoncpp/include/" - ] - }, - { - "name": "libnl:libnl_share", - "so_file_name": "libnl_share.z.so", - "path": "//third_party/libnl:libnl_share", "headers": [] }, { - "name": "zlib:shared_libz", - "so_file_name": "libshared_libz.z.so", - "path": "//third_party/zlib:shared_libz", - "headers": [ - "//third_party/zlib/" - ] - }, - { - "name": "openssl:libcrypto_shared", - "so_file_name": "libcrypto_openssl.z.so", - "path": "//third_party/openssl:libcrypto_shared", - "headers": [ - "//third_party/openssl/include/", - "//out/rk3568/obj/third_party/openssl/build_all_generated/include/" - ] - }, - { - "name": "libunwind:libunwind", - "so_file_name": "libunwind.z.so", - "path": "//third_party/libunwind:libunwind", - "headers": [ - "//third_party/libunwind/src/", - "//third_party/libunwind/include/", - "//third_party/libunwind/include/tdep-arm/" - ] - }, - { - "name": "samgr:samgr_proxy", - "so_file_name": "libsamgr_proxy.z.so", - "path": "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "headers": [ - "//foundation/systemabilitymgr/samgr/services/lsamgr/include/" - ] - }, - { - "name": "drivers_interface_power:libpower_proxy_1.0", - "so_file_name": "libpower_proxy_1.0.z.so", - "path": "//drivers/interface/power/v1_0:libpower_proxy_1.0", - "headers": [ - "//drivers/hdf_core/adapter/uhdf2/include/hdi/", - "//drivers/hdf_core/adapter/uhdf2/osal/include/", - "//drivers/hdf_core/adapter/uhdf2/ipc/include/", - "//drivers/hdf_core/framework/include/utils/", - "//drivers/hdf_core/interfaces/inner_api/utils/", - "//drivers/hdf_core/interfaces/inner_api/osal/uhdf/", - "//drivers/hdf_core/interfaces/inner_api/hdi/", - "//out/rk3568/gen/drivers/interface/", - "//out/rk3568/gen/drivers/interface/power/" - ] - }, - { - "name": "drivers_interface_camera:libbuffer_producer_sequenceable_1.0", - "so_file_name": "libbuffer_producer_sequenceable_1.0.z.so", - "path": "//drivers/interface/camera/sequenceable/buffer_producer:libbuffer_producer_sequenceable_1.0", - "headers": [ - "//drivers/interface/camera/sequenceable/buffer_producer/", - "//commonlibrary/c_utils/base/include/", - "//third_party/bounds_checking_function/include/", - "//foundation/systemabilitymgr/samgr/services/lsamgr/include/", - "//base/notification/eventhandler/interfaces/inner_api/", - "//base/notification/eventhandler/frameworks/eventhandler/include/" - ] - }, - { - "name": "ffmpeg:libohosffmpeg", - "so_file_name": "libohosffmpeg.z.so", - "path": "//third_party/ffmpeg:libohosffmpeg", - "headers": [ - "//third_party/ffmpeg" - ] - }, - { - "name": "pulsecore:pulsecore", - "so_file_name": "libpulsecore.z.so", - "path": "//third_party/pulseaudio/ohosbuild/src/pulsecore:pulsecore", + "name": "security:cert_manager_sdk", + "so_file_name": "libcert_manager_sdk.z.so", + "path": "//base/security/certificate_manager/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", "headers": [] }, { - "name": "src:pulsecommon", - "so_file_name": "libpulsecommon.z.so", - "path": "//third_party/pulseaudio/ohosbuild/src:pulsecommon", + "name": "commonlibrary:ylong_runtime", + "so_file_name": "libylong_runtime.dylib.so", + "path": "//commonlibrary/rust/ylong_runtime/ylong_runtime:ylong_runtime", "headers": [] }, { - "name": "pulseaudio:speexresampler", - "so_file_name": "libspeexresampler.z.so", - "path": "//third_party/pulseaudio/speex:speexresampler", - "headers": [ - "//third_party/pulseaudio/speex/include/" - ] - }, - { - "name": "libsnd:sndfile", - "so_file_name": "libsndfile.z.so", - "path": "//third_party/libsnd:sndfile", + "name": "thirdparty:libxml2", + "so_file_name": "libxml2.z.so", + "path": "//third_party/libxml2:libxml2", "headers": [] }, { - "name": "protobuf:protobuf_lite", - "so_file_name": "libprotobuf_lite.z.so", - "path": "//third_party/protobuf:protobuf_lite", - "headers": [ - "//third_party/protobuf/src/" - ] - }, - { - "name": "memory_utils:libdmabufheap", - "so_file_name": "libdmabufheap.z.so", - "path": "//commonlibrary/memory_utils/libdmabufheap:libdmabufheap", - "headers": [ - "//commonlibrary/memory_utils/libdmabufheap/include/" - ] - }, - { - "name": "memory_utils:libsync", - "so_file_name": "libsync.z.so", - "path": "//commonlibrary/memory_utils/libsync:libsync", - "headers": [ - "//commonlibrary/memory_utils/libsync/include/" - ] - }, - { - "name": "graphic_surface:sync_fence", - "so_file_name": "libsync_fence.z.so", - "path": "//foundation/graphic/graphic_surface/sync_fence:sync_fence", - "headers": [ - "//foundation/graphic/graphic_surface/interfaces/inner_api/sync_fence" - ] - }, - { - "name": "graphic_surface:surface", - "so_file_name": "libsurface.z.so", - "path": "//foundation/graphic/graphic_surface/surface:surface", - "headers": [ - "//foundation/graphic/graphic_surface/interfaces/inner_api/surface" - ] - }, - { - "name": "graphic_surface:buffer_handle", - "so_file_name": "libbuffer_handle.z.so", - "path": "//foundation/graphic/graphic_surface/buffer_handle:buffer_handle", - "headers": [ - "//foundation/graphic/graphic_surface/interfaces/inner_api/buffer_handle" - ] - }, - { - "name": "access_token:libaccesstoken_sdk", - "so_file_name": "libaccesstoken_sdk.z.so", - "path": "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "headers": [ - "//base/security/access_token/interfaces/innerkits/accesstoken/include/" - ] - }, - { - "name": "drivers_interface_camera:metadata", - "so_file_name": "libmetadata.z.so", - "path": "//drivers/interface/camera/metadata:metadata", - "headers": [ - "//drivers/interface/camera/metadata/include/", - "//drivers/interface/camera/sequenceable/buffer_producer/", - "//commonlibrary/c_utils/base/include/", - "//third_party/bounds_checking_function/include/", - "//foundation/systemabilitymgr/samgr/services/lsamgr/include/", - "//base/notification/eventhandler/interfaces/inner_api/", - "//base/notification/eventhandler/frameworks/eventhandler/include/" - - ] - }, - { - "name": "hitrace:hitrace_meter", - "so_file_name": "libhitrace_meter.so", - "path": "//base/hiviewdfx/hitrace/interfaces/native/innerkits:hitrace_meter", - "headers": [ - "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter/", - "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/", - "//base/hiviewdfx/hitrace/frameworks/include/" - ] - }, - { - "name": "hitrace:libhitracechain", - "so_file_name": "libhitracechain.so", - "path": "//base/hiviewdfx/hitrace/interfaces/native/innerkits:libhitracechain", - "headers": [ - "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace/" - ] - }, - { - "name": "hdf_core:libhdf_utils", - "so_file_name": "libhdf_utils.z.so", - "path": "//drivers/hdf_core/adapter/uhdf2/utils:libhdf_utils", - "headers": [ - "//drivers/hdf_core/interfaces/inner_api/osal/shared/", - "//drivers/hdf_core/interfaces/inner_api/osal/uhdf/", - "//drivers/hdf_core/interfaces/inner_api/utils/", - "//drivers/hdf_core/interfaces/inner_api/core/", - "//drivers/hdf_core/interfaces/inner_api/ipc/", - "//drivers/hdf_core/interfaces/inner_api/hdi/" - ] - }, - { - "name": "drivers_peripheral_codec:libcodec_hdi_omx_callback_type_service_impl", - "so_file_name": "libcodec_hdi_omx_callback_type_service_impl.z.so", - "path": "//drivers/peripheral/codec/hal:libcodec_hdi_omx_callback_type_service_impl", - "headers": [ - "//commonlibrary/c_utils/base/include/", - "//third_party/bounds_checking_function/include/", - "//foundation/systemabilitymgr/samgr/services/lsamgr/include/" - ] - }, - { - "name": "ipc:ipc_core", - "so_file_name": "libipc_core.z.so", - "path": "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", - "headers": [ - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include/", - "//foundation/communication/ipc/ipc/native/src/core/include/", - "//foundation/communication/ipc/ipc/native/src/mock/include/", - "//commonlibrary/c_utils/base/include/" - ] - }, - { - "name": "bluetooth:btcommon", - "so_file_name": "libbtcommon.z.so", - "path": "//foundation/communication/bluetooth/frameworks/inner:btcommon", - "headers": [ - "//foundation/communication/bluetooth/frameworks/inner/common/", - "//foundation/communication/bluetooth/frameworks/inner/ipc/common/", - "//foundation/communication/bluetooth/frameworks/inner/ipc/include/", - "//foundation/communication/bluetooth/frameworks/inner/ipc/interface/", - "//foundation/communication/bluetooth/frameworks/inner/ipc/parcel/" - ] + "name": "thirdparty:mbedtls_shared", + "so_file_name": "libmbedtls.z.so", + "path": "//third_party/mbedtls:mbedtls_shared", + "headers": [] }, { - "name": "build_framework:libclang_rt.ubsan_minimal.so", - "so_file_name": "libclang_rt.ubsan_minimal.so", - "path": "//build/common/ubsan:libclang_rt.ubsan_minimal.so", + "name": "hdf:libbuffer_producer_sequenceable_1.0", + "so_file_name": "libbuffer_producer_sequenceable_1.0.z.so", + "path": "//drivers/interface/camera/sequenceable/buffer_producer:libbuffer_producer_sequenceable_1.0", "headers": [] }, { - "name": "build_framework:libclang_rt.ubsan_standalone.so", + "name": "build:libclang_rt.ubsan_standalone.so", "so_file_name": "libclang_rt.ubsan_standalone.so", "path": "//build/common/ubsan:libclang_rt.ubsan_standalone.so", "headers": [] }, { - "name": "unknow", - "so_file_name": "libopencv_core.z.so", - "path": "", - "headers": [] - }, - { - "name": "unknow", - "so_file_name": "libopencv_imgproc.z.so", - "path": "", - "headers": [] - }, - { - "name": "curl:curl_shared", - "so_file_name": "libcurl_shared.z.so", - "path": "//third_party/curl:curl_shared", - "headers": [ - "//third_party/curl/include/", - "//third_party/curl/customized/include/" - ] - }, - { - "name": "safwk:system_ability_fwk", - "so_file_name": "libsystem_ability_fwk.z.so", - "path": "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", - "headers": [ - "//foundation/systemabilitymgr/safwk/services/safwk/include/", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk/" - ] - }, - { - "name": "caas_service:libcpp_shared", - "so_file_name": "libc++_shared.so", - "path": "", + "name": "thirdparty:libnl_share", + "so_file_name": "libnl_share.z.so", + "path": "//third_party/libnl:libnl_share", "headers": [] }, { - "name": "drivers_interface_camera:libmap_data_sequenceable_1.0", - "so_file_name": "libmap_data_sequenceable_1.0.z.so", - "path": "//drivers/interface/camera/sequenceable/map_data:libmap_data_sequenceable_1.0", - "headers": [ - "//drivers/interface/camera/sequenceable/map_data/", - "//commonlibrary/c_utils/base/include/", - "//third_party/bounds_checking_function/include/", - "//foundation/systemabilitymgr/samgr/services/lsamgr/include/", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/dynamic_cache/include/", - "//base/notification/eventhandler/interfaces/inner_api/", - "//base/notification/eventhandler/frameworks/eventhandler/include/" - ] - }, - { - "name": "drivers_interface_camera:libbuffer_handle_sequenceable_1.0", + "name": "hdf:libbuffer_handle_sequenceable_1.0", "so_file_name": "libbuffer_handle_sequenceable_1.0.z.so", "path": "//drivers/interface/camera/sequenceable/buffer_handle:libbuffer_handle_sequenceable_1.0", - "headers": [ - "//drivers/interface/camera/sequenceable/buffer_handle/", - "//commonlibrary/c_utils/base/include/", - "//third_party/bounds_checking_function/include/", - "//foundation/systemabilitymgr/samgr/services/lsamgr/include/", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/dynamic_cache/include/" - ] - }, - { - "name": "ffrt:libffrt", - "so_file_name": "libffrt.so", - "path": "//foundation/resourceschedule/ffrt:libffrt", - "headers": [ - "//foundation/resourceschedule/ffrt/interfaces/kits/", - "//foundation/resourceschedule/ffrt/interfaces/inner_api/", - "//foundation/resourceschedule/ffrt/include/", - "//foundation/resourceschedule/ffrt/src_ext/" - ] - }, - { - "name": "openssl:libssl_shared", - "so_file_name": "libssl_openssl.z.so", - "path": "//third_party/openssl:libssl_shared", - "headers": [ - "//third_party/openssl/include/" - ] - }, - { - "name": "certificate_manager:cert_manager_sdk", - "so_file_name": "libcert_manager_sdk.z.so", - "path": "//base/security/certificate_manager/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", - "headers": [ - "//base/security/certificate_manager/interfaces/innerkits/cert_manager_standard/main/include/" - ] - }, - { - "name": "build_framework:libclang_rt.asan.so", - "so_file_name": "libclang_rt.asan.so", - "path": "//build/common/asan:libclang_rt.asan.so", "headers": [] }, { - "name": "build_framework:libclang_rt.hwasan.so", - "so_file_name": "libclang_rt.hwasan.so", - "path": "//build/common/asan:libclang_rt.hwasan.so", + "name": "security:libservice_checker", + "so_file_name": "libservice_checker.z.so", + "path": "//base/security/selinux_adapter:libservice_checker", "headers": [] }, { - "name": "build_framework:libclang_rt.tsan.so", - "so_file_name": "libclang_rt.tsan.so", - "path": "//build/common/asan:libclang_rt.tsan.so", + "name": "thirdparty:libdrm", + "so_file_name": "libdrm.so", + "path": "//third_party/libdrm:libdrm", "headers": [] }, { - "name": "soc_perf:socperf_client", - "so_file_name": "libsocperf_client.z.so", - "path": "//foundation/resourceschedule/soc_perf/interfaces/inner_api/socperf_client:socperf_client", - "headers": [ - "//foundation/resourceschedule/soc_perf/interfaces/inner_api/socperf_client/include/" - ] - }, - { - "name": "hiprofiler:libffrt_profiler", - "so_file_name": "libffrt_profiler.z.so", - "path": "//developtools/profiler/device/plugins/ffrt_profiler/client:libffrt_profiler", - "headers": [ - "//developtools/profiler/device/plugins/ffrt_profiler/client/include/" - ] - }, - { - "name": "libusb:libusb", - "so_file_name": "libusb_shared.z.so", - "path": "//third_party/libusb:libusb", - "headers": [ - "//third_party/libusb/libusb/libusb/" - ] + "name": "hdf:libaudio_proxy_5.0", + "so_file_name": "libaudio_proxy_5.0.z.so", + "path": "//drivers/interface/audio/v5_0:libaudio_proxy_5.0", + "headers": [] }, { - "name": "huks:libhukssdk", - "so_file_name": "libhukssdk.z.so", - "path": "//base/security/huks/interfaces/inner_api/huks_standard/main:libhukssdk", - "headers": [ - "//base/security/huks/interfaces/inner_api/huks_standard/main/include" - ] + "name": "hdf:libpower_proxy_1.3", + "so_file_name": "libpower_proxy_1.3.z.so", + "path": "//drivers/interface/power/v1_3:libpower_proxy_1.3", + "headers": [] }, { - "name": "tee_client:libteec_vendor", - "so_file_name": "libteec_vendor.so", - "path": "//base/tee/tee_client/frameworks/build/standard:libteec_vendor", - "headers": [ - "//base/tee/tee_client/interfaces/inner_api" - ] + "name": "thirdparty:libpng", + "so_file_name": "libpng.z.so", + "path": "//third_party/libpng:libpng", + "headers": [] }, { - "name": "drivers_interface_display:display_buffer", - "so_file_name": "libdisplay_buffer_proxy_1.0.z.so", - "path": "//drivers/interface/display/buffer/v1.0:libdisplay_buffer_proxy_1.0", - "headers": [ - "//drivers/interface/display/buffer/v1.0" - ] + "name": "hiviewdfx:libhilog", + "so_file_name": "libhilog.so", + "path": "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + "headers": [] }, { - "name": "drivers_interface_camera:libcamera_secure_proxy_1.1", - "so_file_name": "libcamera_secure_proxy_1.1.z.so", - "path": "", + "name": "hdf:libdisplay_buffer_hdi_impl", + "so_file_name": "libdisplay_buffer_hdi_impl.z.so", + "path": "//drivers/interface/display/buffer/v1_0:libdisplay_buffer_hdi_impl", "headers": [] }, { - "name": "bounds_checking_function:libsec_shared", - "so_file_name": "libsec_shared.so", - "path": "//third_party/bounds_checking_function:libsec_shared", + "name": "hiviewdfx:xperfservice_client", + "so_file_name": "libxperfservice_client.z.so", + "path": "//base/hiviewdfx/hiview/plugins/performance/xperf_service/interfaces/inner_api/xperfservice_client:xperfservice_client", "headers": [] }, { - "name": "protobuf:protobuf_lite", - "so_file_name": "libprotobuf_lite.so", - "path": "//third_party/protobuf:protobuf_lite", + "name": "resourceschedule:socperf_client", + "so_file_name": "libsocperf_client.z.so", + "path": "//foundation/resourceschedule/soc_perf/interfaces/inner_api/socperf_client:socperf_client", "headers": [] }, { - "name": "zlib:shared_libz", - "so_file_name": "libshared_libz.so", - "path": "//third_party/zlib:shared_libz", + "name": "hdf:libpower_proxy_1.0", + "so_file_name": "libpower_proxy_1.0.z.so", + "path": "//drivers/interface/power/v1_0:libpower_proxy_1.0", "headers": [] }, { - "name": "hilog:hilog_ndk", - "so_file_name": "libhilog_ndk.z.so", - "path": "", + "name": "developtools:libffrt_profiler", + "so_file_name": "libffrt_profiler.z.so", + "path": "//developtools/profiler/device/plugins/ffrt_profiler/client:libffrt_profiler", "headers": [] }, { - "name": "face_auth:faceauth_framework", - "so_file_name": "libfaceauth_framework.z.so", - "path": "", + "name": "thirdparty:libusb", + "so_file_name": "libusb_shared.z.so", + "path": "//third_party/libusb:libusb", "headers": [] }, { - "name": "hianalytics_service:ha_client_lite", - "so_file_name": "libha_client_lite.z.so", - "path": "", + "name": "build:libclang_rt.ubsan_minimal.so", + "so_file_name": "libclang_rt.ubsan_minimal.so", + "path": "//build/common/ubsan:libclang_rt.ubsan_minimal.so", "headers": [] }, { - "name": "container_comm:uds_channel", - "so_file_name": "libuds_channel.z.so", - "path": "", + "name": "security:libhukssdk", + "so_file_name": "libhukssdk.z.so", + "path": "//base/security/huks/interfaces/inner_api/huks_standard/main:libhukssdk", "headers": [] }, { - "name": "libyuv:yuv", - "so_file_name": "libyuv.z.so", - "path": "", + "name": "thirdparty:curl_shared", + "so_file_name": "libcurl_shared.z.so", + "path": "//third_party/curl:curl_shared", "headers": [] }, { - "name": "drivers_interface_perfgenius:perfgenius_client", - "so_file_name": "libperfgenius_client.z.so", - "path": "", + "name": "hdf:libdisplay_buffer_hdi_impl_v1_3", + "so_file_name": "libdisplay_buffer_hdi_impl_v1_3.z.so", + "path": "//drivers/interface/display/buffer/v1_3:libdisplay_buffer_hdi_impl_v1_3", "headers": [] }, { - "name": "drivers_interface_perfgenius:perfgenius", - "so_file_name": "libperfgenius_proxy_1.0.z.so", - "path": "", + "name": "thirdparty:libohosffmpeg", + "so_file_name": "libohosffmpeg.z.so", + "path": "//third_party/ffmpeg:libohosffmpeg", "headers": [] }, { - "name": "commonlibrary:ylong_runtime", - "so_file_name": "libylong_runtime.dylib.so", - "path": "//commonlibrary/rust/ylong_runtime/ylong_runtime:ylong_runtime", + "name": "thirdparty:turbojpeg", + "so_file_name": "libturbojpeg.z.so", + "path": "//third_party/libjpeg-turbo:turbojpeg", "headers": [] } -] +] \ No newline at end of file diff --git a/tools/deps_guard/rules/ChipsetsdkSP/chipsetsdk_sp_indirect_info.json b/tools/deps_guard/rules/ChipsetsdkSP/chipsetsdk_sp_indirect_info.json index c1a920e..586981e 100755 --- a/tools/deps_guard/rules/ChipsetsdkSP/chipsetsdk_sp_indirect_info.json +++ b/tools/deps_guard/rules/ChipsetsdkSP/chipsetsdk_sp_indirect_info.json @@ -1,62 +1,128 @@ [ { - "name": "faultloggerd:libdfx_dumpcatcher", + "name": "resourceschedule:ressched_client", + "so_file_name": "libressched_client.z.so", + "path": "//foundation/resourceschedule/resource_schedule_service/ressched/interfaces/innerkits/ressched_client:ressched_client", + "headers": [] + }, + { + "name": "hiviewdfx:libdfx_procinfo", + "so_file_name": "libdfx_procinfo.z.so", + "path": "//base/hiviewdfx/faultloggerd/interfaces/innerkits/procinfo:libdfx_procinfo", + "headers": [] + }, + { + "name": "filemanagement:storage_manager_acl", + "so_file_name": "libstorage_manager_acl.z.so", + "path": "//foundation/filemanagement/storage_service/interfaces/innerkits/acl/native:storage_manager_acl", + "headers": [] + }, + { + "name": "hiviewdfx:libdfx_dumpcatcher", "so_file_name": "libdfx_dumpcatcher.z.so", "path": "//base/hiviewdfx/faultloggerd/interfaces/innerkits/dump_catcher:libdfx_dumpcatcher", "headers": [] }, { - "name": "faultloggerd:libfaultloggerd", + "name": "hiviewdfx:libucollection_client", + "so_file_name": "libucollection_client.z.so", + "path": "//base/hiviewdfx/hiview/interfaces/inner_api/unified_collection/client:libucollection_client", + "headers": [] + }, + { + "name": "hdf:libdisplay_buffer_proxy_1.0", + "so_file_name": "libdisplay_buffer_proxy_1.0.z.so", + "path": "//drivers/interface/display/buffer/v1_0:libdisplay_buffer_proxy_1.0", + "headers": [] + }, + { + "name": "hdf:libdisplay_buffer_proxy_1.1", + "so_file_name": "libdisplay_buffer_proxy_1.1.z.so", + "path": "//drivers/interface/display/buffer/v1_1:libdisplay_buffer_proxy_1.1", + "headers": [] + }, + { + "name": "hiviewdfx:libfaultloggerd", "so_file_name": "libfaultloggerd.z.so", "path": "//base/hiviewdfx/faultloggerd/interfaces/innerkits/faultloggerd_client:libfaultloggerd", "headers": [] }, { - "name": "faultloggerd:libdfx_procinfo", - "so_file_name": "libdfx_procinfo.z.so", - "path": "//base/hiviewdfx/faultloggerd/interfaces/innerkits/procinfo:libdfx_procinfo", + "name": "hiviewdfx:dfx_signalhandler", + "so_file_name": "libdfx_signalhandler.z.so", + "path": "//base/hiviewdfx/faultloggerd/interfaces/innerkits/signal_handler:dfx_signalhandler", "headers": [] }, { - "name": "faultloggerd:libunwinder", - "so_file_name": "libunwinder.z.so", - "path": "//base/hiviewdfx/faultloggerd/interfaces/innerkits/unwinder:libunwinder", + "name": "thirdparty:libpcre2", + "so_file_name": "libpcre2.z.so", + "path": "//third_party/pcre2:libpcre2", "headers": [] }, { - "name": "hitrace:libhitracechain", - "so_file_name": "libhitracechain.so", - "path": "//base/hiviewdfx/hitrace/interfaces/innerkits/native/innerkits:libhitracechain", + "name": "hiviewdfx:libthread_sampler", + "so_file_name": "libthread_sampler.z.so", + "path": "//base/hiviewdfx/hicollie/frameworks/native/thread_sampler:libthread_sampler", "headers": [] }, { - "name": "hiview:libucollection_client", - "so_file_name": "libucollection_client.z.so", - "path": "//base/hiviewdfx/hiview/interfaces/inner_api/unified_collection/client:libcollection_client", + "name": "thirdparty:lzma_shared", + "so_file_name": "liblzma.z.so", + "path": "//third_party/lzma:lzma_shared", "headers": [] }, { - "name": "eventhandler:libeventhandler", + "name": "notification:libeventhandler", "so_file_name": "libeventhandler.z.so", "path": "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", "headers": [] }, { - "name": "storage_service:storage_manager_acl", - "so_file_name": "libstorage_manager_acl.z.so", - "path": "//foundation/filemanagement/storage_service/interfaces/innerkits/acl/native:storage_manager_acl", + "name": "hdf:libdisplay_buffer_proxy_1.2", + "so_file_name": "libdisplay_buffer_proxy_1.2.z.so", + "path": "//drivers/interface/display/buffer/v1_2:libdisplay_buffer_proxy_1.2", "headers": [] }, { - "name": "resource_schedule_service:ressched_client", - "so_file_name": "libressched_client.z.so", - "path": "//foundation/resourceschedule/resource_schedule_service/ressched/interfaces/innerkits/ressched_client:ressched_client", + "name": "communication:ipc_common", + "so_file_name": "libipc_common.z.so", + "path": "//foundation/communication/ipc/ipc/native/src/core:ipc_common", "headers": [] }, { - "name": "lzma:lzma_shared", - "so_file_name": "lzma_shared.z.so", - "path": "//third_party/lzma:lzma_shared", + "name": "hdf:libdisplay_buffer_hdi_impl_v1_2", + "so_file_name": "libdisplay_buffer_hdi_impl_v1_2.z.so", + "path": "//drivers/interface/display/buffer/v1_2:libdisplay_buffer_hdi_impl_v1_2", + "headers": [] + }, + { + "name": "hiviewdfx:rustc_demangle", + "so_file_name": "librustc_demangle.z.so", + "path": "//base/hiviewdfx/faultloggerd/interfaces/rust/rustc_demangle:rustc_demangle", + "headers": [] + }, + { + "name": "hiviewdfx:libstack_printer", + "so_file_name": "libstack_printer.z.so", + "path": "//base/hiviewdfx/faultloggerd/interfaces/innerkits/stack_printer:libstack_printer", + "headers": [] + }, + { + "name": "hiviewdfx:libasync_stack", + "so_file_name": "libasync_stack.z.so", + "path": "//base/hiviewdfx/faultloggerd/interfaces/innerkits/async_stack:libasync_stack", + "headers": [] + }, + { + "name": "thirdparty:libselinux", + "so_file_name": "libselinux.z.so", + "path": "//third_party/selinux:libselinux", + "headers": [] + }, + { + "name": "hiviewdfx:libunwinder", + "so_file_name": "libunwinder.z.so", + "path": "//base/hiviewdfx/faultloggerd/interfaces/innerkits/unwinder:libunwinder", "headers": [] } ] \ No newline at end of file diff --git a/tools/deps_guard/rules/ChipsetsdkSP/chipsetsdk_sp_info.json b/tools/deps_guard/rules/ChipsetsdkSP/chipsetsdk_sp_info.json index 4cbf06e..2b9dc37 100755 --- a/tools/deps_guard/rules/ChipsetsdkSP/chipsetsdk_sp_info.json +++ b/tools/deps_guard/rules/ChipsetsdkSP/chipsetsdk_sp_info.json @@ -1,134 +1,188 @@ [ { - "name": "faultloggerd:libbacktrace_local", - "so_file_name": "libbacktrace_local.so", - "path": "//base/hiviewdfx/faultloggerd/interfaces/innerkits/backtrace:libbacktrace_local", + "name": "build:libc++_shared.so", + "so_file_name": "libc++_shared.so", + "path": "//build/common/libcpp:libc++_shared.so", "headers": [] }, { - "name": "hisysevent:libhisysevent", - "so_file_name": "libhisysevent.so", - "path": "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent:libhisysevent", + "name": "hdf:libhdifd_parcelable", + "so_file_name": "libhdifd_parcelable.z.so", + "path": "//drivers/interface/display/composer/hdifd_parcelable:libhdifd_parcelable", "headers": [] }, { - "name": "cJSON:cjson", - "so_file_name": "libcjson.z.so", - "path": "//third_party/cJSON:cjson", + "name": "graphic:surface", + "so_file_name": "libsurface.z.so", + "path": "//foundation/graphic/graphic_surface/surface:surface", "headers": [] }, { - "name": "hicollie:libhicollie", - "so_file_name": "libhicollie.z.so", - "path": "//third_party/cJSON:cjson", + "name": "graphic:buffer_handle", + "so_file_name": "libbuffer_handle.z.so", + "path": "//foundation/graphic/graphic_surface/buffer_handle:buffer_handle", "headers": [] }, { - "name": "hitrace:hitrace_meter", - "so_file_name": "libhitrace_meter.so", - "path": "//base/hiviewdfx/hitrace/interfaces/native/innerkits:hitrace_meter", + "name": "hdf:libhdf_utils", + "so_file_name": "libhdf_utils.z.so", + "path": "//drivers/hdf_core/adapter/uhdf2/utils:libhdf_utils", "headers": [] }, { - "name": "init:libbeget_proxy", - "so_file_name": "libbeget_proxy.so", - "path": "//base/startup/init/interfaces/innerkits:libbeget_proxy", + "name": "hiviewdfx:libhitracechain", + "so_file_name": "libhitracechain.so", + "path": "//base/hiviewdfx/hitrace/interfaces/native/innerkits:libhitracechain", "headers": [] }, { - "name": "init:libbegetutil", - "so_file_name": "libbegetutil.z.so", - "path": "//base/startup/init/interfaces/innerkits:libbegetutil", + "name": "thirdparty:protobuf_lite", + "so_file_name": "libprotobuf_lite.z.so", + "path": "//third_party/protobuf:protobuf_lite", "headers": [] }, { - "name": "c_utils:utils", - "so_file_name": "libutils.z.so", - "path": "//commonlibrary/c_utils/base:utils", + "name": "hdf:libhdi", + "so_file_name": "libhdi.z.so", + "path": "//drivers/hdf_core/adapter/uhdf2/hdi:libhdi", "headers": [] }, { - "name": "ets_utils:utils", - "so_file_name": "libutils.z.so", - "path": "//commonlibrary/ets_utils/js_concurrent_module/utils:utils", + "name": "systemabilitymgr:samgr_proxy", + "so_file_name": "libsamgr_proxy.z.so", + "path": "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "headers": [] }, { - "name": "hdf_core:libhdi", - "so_file_name": "libhdi.z.so", - "path": "//drivers/hdf_core/adapter/uhdf2/hdi:libhdi", + "name": "customization:configpolicy_util", + "so_file_name": "libconfigpolicy_util.z.so", + "path": "//base/customization/config_policy/frameworks/config_policy:configpolicy_util", "headers": [] }, { - "name": "hdf_core:libhdf_ipc_adatper", - "so_file_name": "libhdf_ipc_adatper.z.so", - "path": "//drivers/hdf_core/adapter/uhdf2/ipc:libhdf_ipc_adatper", + "name": "hiviewdfx:libhisysevent", + "so_file_name": "libhisysevent.z.so", + "path": "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent:libhisysevent", "headers": [] }, { - "name": "hdf_core:libpub_utils", - "so_file_name": "libpub_utils.z.so", - "path": "//drivers/hdf_core/adapter/uhdf2/pub_utils:libpub_utils", + "name": "thirdparty:libcrypto_shared", + "so_file_name": "libcrypto_openssl.z.so", + "path": "//third_party/openssl:libcrypto_shared", "headers": [] }, { - "name": "hdf_core:libhdf_utils", - "so_file_name": "libhdf_utils.z.so", - "path": "//drivers/hdf_core/adapter/uhdf2/utils:libhdf_utils", + "name": "build:musl-libcxx.so", + "so_file_name": "libc++.so", + "path": "//build/common/musl:musl-libcxx.so", "headers": [] }, { - "name": "drivers_interface_codec:libcodec_proxy_3.0", - "so_file_name": "libcodec_proxy_3.0.z.so", - "path": "//drivers/interface/codec/v3.0:libcodec_proxy_3.0", + "name": "hiviewdfx:libbacktrace_local", + "so_file_name": "libbacktrace_local.so", + "path": "//base/hiviewdfx/faultloggerd/interfaces/innerkits/backtrace:libbacktrace_local", "headers": [] }, { - "name": "drivers_interface_display:libhdifd_parcelable", - "so_file_name": "libhdifd_parcelable.z.so", - "path": "//drivers/interface/display/composer/hdifd_parcelable:libhdifd_parcelable", + "name": "startup:libbegetutil-pub-sdk", + "so_file_name": "libbegetutil.z.so", + "path": "//base/startup/init/interfaces/innerkits:libbegetutil-pub-sdk", "headers": [] }, { - "name": "graphic_surface:buffer_handle", - "so_file_name": "libbuffer_handle.z.so", - "path": "//foundation/graphic/graphic_surface/buffer_handle:buffer_handle", + "name": "startup:libbeget_proxy", + "so_file_name": "libbeget_proxy.z.so", + "path": "//base/startup/init/interfaces/innerkits:libbeget_proxy", "headers": [] }, { - "name": "ffrt:libffrt", - "so_file_name": "libffrt.so", - "path": "//foundation/resourceschedule/ffrt:libffrt", + "name": "communication:ipc_core", + "so_file_name": "libipc_single.z.so", + "path": "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "headers": [] }, { - "name": "bounds_checking_function:libsec_shared", + "name": "thirdparty:libunwind", + "so_file_name": "libunwind.z.so", + "path": "//third_party/libunwind:libunwind", + "headers": [] + }, + { + "name": "hdf:libpub_utils", + "so_file_name": "libpub_utils.z.so", + "path": "//drivers/hdf_core/adapter/uhdf2/pub_utils:libpub_utils", + "headers": [] + }, + { + "name": "tee:libteec_vendor", + "so_file_name": "libteec_vendor.so", + "path": "//base/tee/tee_client/frameworks/build/standard:libteec_vendor", + "headers": [] + }, + { + "name": "commonlibrary:utils", + "so_file_name": "libutils.z.so", + "path": "//commonlibrary/c_utils/base:utils", + "headers": [] + }, + { + "name": "hdf:libhdf_ipc_adapter", + "so_file_name": "libhdf_ipc_adapter.z.so", + "path": "//drivers/hdf_core/adapter/uhdf2/ipc:libhdf_ipc_adapter", + "headers": [] + }, + { + "name": "thirdparty:jsoncpp", + "so_file_name": "libjsoncpp.z.so", + "path": "//third_party/jsoncpp:jsoncpp", + "headers": [] + }, + { + "name": "thirdparty:libsec_shared", "so_file_name": "libsec_shared.z.so", "path": "//third_party/bounds_checking_function:libsec_shared", "headers": [] }, { - "name": "hilog:libhilog", - "so_file_name": "libhilog.so", - "path": "", + "name": "hiviewdfx:hitrace_meter", + "so_file_name": "libhitrace_meter.so", + "path": "//base/hiviewdfx/hitrace/interfaces/native/innerkits:hitrace_meter", "headers": [] }, { - "name": "graphic_surface:surface", - "so_file_name": "libsurface.z.so", - "path": "//foundation/graphic/graphic_surface/surface:surface", + "name": "commonlibrary:libdmabufheap", + "so_file_name": "libdmabufheap.z.so", + "path": "//commonlibrary/memory_utils/libdmabufheap:libdmabufheap", "headers": [] }, { - "name": "graphic_surface:sync_fence", + "name": "hiviewdfx:libhicollie", + "so_file_name": "libhicollie.z.so", + "path": "//base/hiviewdfx/hicollie/interfaces/native/innerkits:libhicollie", + "headers": [] + }, + { + "name": "thirdparty:cjson", + "so_file_name": "libcjson.z.so", + "path": "//third_party/cJSON:cjson", + "headers": [] + }, + { + "name": "thirdparty:shared_libz", + "so_file_name": "libshared_libz.z.so", + "path": "//third_party/zlib:shared_libz", + "headers": [] + }, + { + "name": "graphic:sync_fence", "so_file_name": "libsync_fence.z.so", - "path": "//foundation/graphic/graphic_surface/surface_fence:sync_fence", + "path": "//foundation/graphic/graphic_surface/sync_fence:sync_fence", "headers": [] }, { - "name": "build_framework:musl-libcxx.so", - "so_file_name": "libc++.so", - "path": "//build/common/musl:musl-libcxx.so", + "name": "resourceschedule:libffrt", + "so_file_name": "libffrt.so", + "path": "//foundation/resourceschedule/ffrt:libffrt", "headers": [] } ] \ No newline at end of file diff --git a/tools/deps_guard/rules/Passthrough/passthrough_indirect_info.json b/tools/deps_guard/rules/Passthrough/passthrough_indirect_info.json index d7aea2e..20df29e 100755 --- a/tools/deps_guard/rules/Passthrough/passthrough_indirect_info.json +++ b/tools/deps_guard/rules/Passthrough/passthrough_indirect_info.json @@ -1,8 +1,80 @@ [ { - "name": "hdf:drivers_peripheral_input", + "name": "device_rk3568:libmpp", + "so_file_name": "librockchip_mpp.z.so", + "path": "//device/soc/rockchip/rk3568/hardware/mpp:libmpp", + "headers": [] + }, + { + "name": "hdf:librockchip_vpu", + "so_file_name": "librockchip_vpu.z.so", + "path": "//device/soc/rockchip/rk3568/hardware/mpp/mpp/legacy:librockchip_vpu", + "headers": [] + }, + { + "name": "hdf:libomxvpu_dec", + "so_file_name": "libomxvpu_dec.z.so", + "path": "//device/soc/rockchip/rk3568/hardware/omx_il/component/video/dec:libomxvpu_dec", + "headers": [] + }, + { + "name": "hdf:libOMX_Core", + "so_file_name": "libOMX_Core.z.so", + "path": "//device/soc/rockchip/rk3568/hardware/omx_il/core:libOMX_Core", + "headers": [] + }, + { + "name": "rockchip_products:librga", + "so_file_name": "librga.z.so", + "path": "//device/soc/rockchip/rk3568/hardware/rga:librga", + "headers": [] + }, + { + "name": "hdf:libusb_adapter", + "so_file_name": "libusb_adapter.z.so", + "path": "//drivers/peripheral/usb/libusb_adapter:libusb_adapter", + "headers": [] + }, + { + "name": "hdf:libomxvpu_enc", + "so_file_name": "libomxvpu_enc.z.so", + "path": "//device/soc/rockchip/rk3568/hardware/omx_il/component/video/enc:libomxvpu_enc", + "headers": [] + }, + { + "name": "hdf:libOMX_Pluginhw", + "so_file_name": "libOMX_Pluginhw.z.so", + "path": "//device/soc/rockchip/rk3568/hardware/omx_il/libOMXPlugin:libOMX_Pluginhw", + "headers": [] + }, + { + "name": "hdf:libserial_interface_service_1.0", + "so_file_name": "libserial_interface_service_1.0.z.so", + "path": "//drivers/peripheral/usb/serial:libserial_interface_service_1.0", + "headers": [] + }, + { + "name": "hdf:libusb_host_interface_service_2.0", + "so_file_name": "libusb_host_interface_service_2.0.z.so", + "path": "//drivers/peripheral/usb/hdi_service:libusb_host_interface_service_2.0", + "headers": [] + }, + { + "name": "hdf:hdi_input", "so_file_name": "libhdi_input.z.so", "path": "//drivers/peripheral/input/hal:hdi_input", "headers": [] + }, + { + "name": "hdf:libhuks_hdi_service_1.1", + "so_file_name": "libhuks_hdi_service_1.1.z.so", + "path": "//drivers/peripheral/huks/hdi_service:libhuks_hdi_service_1.1", + "headers": [] + }, + { + "name": "hdf:libRkOMX_Resourcemanager", + "so_file_name": "libRkOMX_Resourcemanager.z.so", + "path": "//device/soc/rockchip/rk3568/hardware/omx_il/component/common:libRkOMX_Resourcemanager", + "headers": [] } ] \ No newline at end of file diff --git a/tools/deps_guard/rules/Passthrough/passthrough_info.json b/tools/deps_guard/rules/Passthrough/passthrough_info.json index e6cd709..04de8e0 100755 --- a/tools/deps_guard/rules/Passthrough/passthrough_info.json +++ b/tools/deps_guard/rules/Passthrough/passthrough_info.json @@ -1,122 +1,62 @@ [ { - "name": "drivers_peripheral_bluetooth:audio_bluetooth_hdi_proxy_server", - "so_file_name": "libaudio_bluetooth_hdi_proxy_server.z.so", - "path": "//drivers/peripheral/bluetooth/audio/hal/hdi_binder/proxy:audio_bluetooth_hdi_proxy_server", - "headers": [] - }, - { - "name": "drivers_peripheral_bluetooth:audio_bluetooth_hdi_proxy_server", - "so_file_name": "libaudio_bluetooth_hdi_proxy_server.z.so", - "path": "", - "headers": [] - }, - { - "name": "drivers_peripheral_huks_override:libhuks_ca_hdi", - "so_file_name": "libhuks_ca_hdi.z.so", - "path": "", - "headers": [] - }, - { - "name": "drivers_peripheral_huks_override:libhuks_ext_hdi_service_1.0", - "so_file_name": "libhuks_ext_hdi_service_1.0.z.so", - "path": "", - "headers": [] - }, - { - "name": "drivers_peripheral_huks_override:libhuks_hdi_service_1.1", - "so_file_name": "libhuks_ext_hdi_service_1.1.z.so", - "path": "", - "headers": [] - }, - { - "name": "hiai:libai_client", - "so_file_name": "libai_client.so", - "path": "", - "headers": [] - }, - { - "name": "higpu:vulkan.hvgr", - "so_file_name": "libmaleoon_v200.so", - "path": "", - "headers": [] - }, - { - "name": "hiai:libai_fmk_hcl_model_runtime", - "so_file_name": "libai_fmk_hcl_model_runtime.so", - "path": "", - "headers": [] - }, - { - "name": "hiai:libai_infra_client", - "so_file_name": "libai_infra_client.so", - "path": "", - "headers": [] - }, - { - "name": "hiai:libai_mnt_client", - "so_file_name": "libai_mnt_client.so", - "path": "", - "headers": [] - }, - { - "name": "ffrt_key:libffrt_acc", - "so_file_name": "libffrt_acc.so", - "path": "", + "name": "hdf:libmapper_service_1.0", + "so_file_name": "libmapper_service_1.0.z.so", + "path": "//drivers/peripheral/display/buffer/hdi_service:libmapper_service_1.0", "headers": [] }, { - "name": "gnss_driver_ext:liblbsservice_tagloc", - "so_file_name": "liblbsservice_tagloc.z.so", - "path": "", + "name": "hdf:libmetadata_service_1.1", + "so_file_name": "libmetadata_service_1.1.z.so", + "path": "//drivers/peripheral/display/buffer/hdi_service:libmetadata_service_1.1", "headers": [] }, { - "name": "higpu:vulkan.hvgr", - "so_file_name": "libmaleoon_v200.so", - "path": "", + "name": "hdf:libmemory_tracker_interface_service_1.0", + "so_file_name": "libmemory_tracker_interface_service_1.0.z.so", + "path": "//drivers/peripheral/memorytracker/hdi_service:libmemory_tracker_interface_service_1.0", "headers": [] }, { - "name": "connectivity_config:package_cal_dis", - "so_file_name": "libmeasure_alg_hisi.z.so", - "path": "", + "name": "hdf:libinput_interfaces_service_1.0", + "so_file_name": "libinput_interfaces_service_1.0.z.so", + "path": "//drivers/peripheral/input/hdi_service:libinput_interfaces_service_1.0", "headers": [] }, { - "name": "video:libvpp.core", - "so_file_name": "libvpp.core.so", - "path": "", + "name": "hdf:audio_bluetooth_hdi_proxy_server", + "so_file_name": "libaudio_bluetooth_hdi_proxy_server.z.so", + "path": "//drivers/peripheral/bluetooth/audio/hal/hdi_binder/proxy:audio_bluetooth_hdi_proxy_server", "headers": [] }, { - "name": "algorithm_camera:libimage_process_client", - "so_file_name": "libimage_process_client.so", - "path": "", + "name": "hdf:libmapper_service_1.3", + "so_file_name": "libmapper_service_1.3.z.so", + "path": "//drivers/peripheral/display/buffer/hdi_service:libmapper_service_1.3", "headers": [] }, { - "name": "drivers_peripheral_codec:libcodec_component_manager_service_3.0", - "so_file_name": "libcodec_component_manager_service_3.0.z.so", - "path": "//drivers/peripheral/codec/hal/idl_service:libcodec_component_manager_service_3.0", + "name": "hdf:libmapper_service_1.2", + "so_file_name": "libmapper_service_1.2.z.so", + "path": "//drivers/peripheral/display/buffer/hdi_service:libmapper_service_1.2", "headers": [] }, { - "name": "drivers_peripheral_display:libmapper_service_1.0", - "so_file_name": "libmapper_service_1.0.z.so", - "path": "//drivers/peripheral/display/buffer/hdi_service:libmapper_service_1.0", + "name": "hdf:libdisplay_buffer_vendor", + "so_file_name": "libdisplay_buffer_vendor.z.so", + "path": "//device/soc/rockchip/rk3568/hardware/display:libdisplay_buffer_vendor", "headers": [] }, { - "name": "drivers_peripheral_display:libmapper_service_1.2", - "so_file_name": "libmapper_service_1.2.z.so", - "path": "//drivers/peripheral/display/buffer/hdi_service:libmapper_service_1.2", + "name": "hdf:libcodec_component_manager_service_4.0", + "so_file_name": "libcodec_component_manager_service_4.0.z.so", + "path": "//drivers/peripheral/codec/hal/idl_service:libcodec_component_manager_service_4.0", "headers": [] }, { - "name": "drivers_peripheral_display:libmetadata_service_1.1", - "so_file_name": "libmetadata_service_1.1.z.so", - "path": "//drivers/peripheral/display/buffer/hdi_service:libmetadata_service_1.1", + "name": "hdf:libdisplay_buffer_vdi_impl", + "so_file_name": "libdisplay_buffer_vdi_impl.z.so", + "path": "//device/soc/rockchip/rk3568/hardware/display:libdisplay_buffer_vdi_impl", "headers": [] } ] \ No newline at end of file diff --git a/tools/deps_guard/rules/dep_whitelist.json b/tools/deps_guard/rules/dep_whitelist.json new file mode 100644 index 0000000..a468b0b --- /dev/null +++ b/tools/deps_guard/rules/dep_whitelist.json @@ -0,0 +1,310 @@ +[ + { + "so_file_name": "libcodec_component_manager_service_4.0.z.so", + "so_file_path": "//drivers/peripheral/codec/hal/idl_service:libcodec_component_manager_service_4.0", + "dep_file_name": "libdisplay_buffer_proxy_1.0.z.so", + "dep_file_path": "//drivers/interface/display/buffer/v1_0:libdisplay_buffer_proxy_1.0", + "description": "libcodec_component_manager_service_4.0.z.so with innerapi_tags [passthrough] depend on libhdiadapter_new.z.so with innerapi_tags [chipsetsdk-sp]" + }, + { + "so_file_name": "libcodec_component_manager_service_4.0.z.so", + "so_file_path": "//drivers/peripheral/codec/hal/idl_service:libcodec_component_manager_service_4.0", + "dep_file_name": "libdisplay_buffer_proxy_1.1.z.so", + "dep_file_path": "//drivers/interface/display/buffer/v1_1:libdisplay_buffer_proxy_1.1", + "description": "libcodec_component_manager_service_4.0.z.so with innerapi_tags [passthrough] depend on libhdiadapter_new.z.so with innerapi_tags [chipsetsdk-sp]" + }, + { + "so_file_name": "libhdifd_parcelable.z.so", + "so_file_path": "system/lib/chipset-sdk-sp/libhdifd_parcelable.z.so", + "dep_file_name": "libhilog.so", + "dep_file_path": "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + "description": "lib libhdifd_parcelable.z.so with innerapi_tags [chipsetsdk_sp] deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libsurface.z.so", + "so_file_path": "system/lib/chipset-sdk-sp/libsurface.z.so", + "dep_file_name": "libdisplay_buffer_hdi_impl_v1_3.z.so", + "dep_file_path": "system/lib/chipset-sdk/libdisplay_buffer_hdi_impl_v1_3.z.so", + "description": "lib libsurface.z.so with innerapi_tags [chipsetsdk_sp,platformsdk] deps wrong lib libdisplay_buffer_hdi_impl_v1_3.z.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libsurface.z.so", + "so_file_path": "system/lib/chipset-sdk-sp/libsurface.z.so", + "dep_file_name": "libclang_rt.ubsan_minimal.so", + "dep_file_path": "system/lib/chipset-sdk/libclang_rt.ubsan_minimal.so", + "description": "lib libsurface.z.so with innerapi_tags [chipsetsdk_sp,platformsdk] deps wrong lib libclang_rt.ubsan_minimal.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libipc_single.z.so", + "so_file_path": "system/lib/chipset-sdk-sp/libipc_single.z.so", + "dep_file_name": "libclang_rt.ubsan_minimal.so", + "dep_file_path": "system/lib/chipset-sdk/libclang_rt.ubsan_minimal.so", + "description": "lib libipc_single.z.so with innerapi_tags [chipsetsdk_sp,platformsdk,sasdk] deps wrong lib libclang_rt.ubsan_minimal.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libutils.z.so", + "so_file_path": "system/lib/chipset-sdk-sp/libutils.z.so", + "dep_file_name": "libclang_rt.ubsan_minimal.so", + "dep_file_path": "system/lib/chipset-sdk/libclang_rt.ubsan_minimal.so", + "description": "lib libutils.z.so with innerapi_tags [chipsetsdk_sp,platformsdk,sasdk] deps wrong lib libclang_rt.ubsan_minimal.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libdisplay_buffer_vendor.z.so", + "so_file_path": "vendor/lib/passthrough/libdisplay_buffer_vendor.z.so", + "dep_file_name": "libdrm.so", + "dep_file_path": "system/lib/chipset-sdk/libdrm.so", + "description": "lib libdisplay_buffer_vendor.z.so with innerapi_tags [passthrough] deps wrong lib libdrm.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libressched_client.z.so", + "so_file_path": "system/lib/chipset-sdk-sp/libressched_client.z.so", + "dep_file_name": "libhilog.so", + "dep_file_path": "system/lib/chipset-sdk/libhilog.so", + "description": "lib libressched_client.z.so with innerapi_tags [chipsetsdk_sp_indirect,platformsdk] deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libstorage_manager_acl.z.so", + "so_file_path": "system/lib/chipset-sdk-sp/libstorage_manager_acl.z.so", + "dep_file_name": "libhilog.so", + "dep_file_path": "system/lib/chipset-sdk/libhilog.so", + "description": "lib libstorage_manager_acl.z.so with innerapi_tags [chipsetsdk_sp_indirect] deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libstorage_manager_acl.z.so", + "so_file_path": "system/lib/chipset-sdk-sp/libstorage_manager_acl.z.so", + "dep_file_name": "libclang_rt.ubsan_minimal.so", + "dep_file_path": "system/lib/chipset-sdk/libclang_rt.ubsan_minimal.so", + "description": "lib libstorage_manager_acl.z.so with innerapi_tags [chipsetsdk_sp_indirect] deps wrong lib libclang_rt.ubsan_minimal.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libdfx_dumpcatcher.z.so", + "so_file_path": "system/lib/chipset-sdk-sp/libdfx_dumpcatcher.z.so", + "dep_file_name": "libdfx_signalhandler.z.so", + "dep_file_path": "system/lib/chipset-sdk/libdfx_signalhandler.z.so", + "description": "lib libdfx_dumpcatcher.z.so with innerapi_tags [chipsetsdk_sp_indirect,platformsdk_indirect] deps wrong lib libdfx_signalhandler.z.so with innerapi_tags [chipsetsdk_indirect]" + }, + { + "so_file_name": "libdfx_dumpcatcher.z.so", + "so_file_path": "system/lib/chipset-sdk-sp/libdfx_dumpcatcher.z.so", + "dep_file_name": "libhilog.so", + "dep_file_path": "system/lib/chipset-sdk/libhilog.so", + "description": "lib libdfx_dumpcatcher.z.so with innerapi_tags [chipsetsdk_sp_indirect,platformsdk_indirect] deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libucollection_client.z.so", + "so_file_path": "system/lib/chipset-sdk-sp/libucollection_client.z.so", + "dep_file_name": "libhilog.so", + "dep_file_path": "system/lib/chipset-sdk/libhilog.so", + "description": "lib libucollection_client.z.so with innerapi_tags [chipsetsdk_sp_indirect,platformsdk] deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libdisplay_buffer_proxy_1.0.z.so", + "so_file_path": "system/lib/chipset-sdk-sp/libdisplay_buffer_proxy_1.0.z.so", + "dep_file_name": "libhilog.so", + "dep_file_path": "system/lib/chipset-sdk/libhilog.so", + "description": "lib libdisplay_buffer_proxy_1.0.z.so with innerapi_tags [chipsetsdk_sp_indirect,platformsdk_indirect] deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libdisplay_buffer_proxy_1.1.z.so", + "so_file_path": "system/lib/chipset-sdk-sp/libdisplay_buffer_proxy_1.1.z.so", + "dep_file_name": "libhilog.so", + "dep_file_path": "system/lib/chipset-sdk/libhilog.so", + "description": "lib libdisplay_buffer_proxy_1.1.z.so with innerapi_tags [chipsetsdk_sp_indirect,platformsdk_indirect] deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libfaultloggerd.z.so", + "so_file_path": "system/lib/chipset-sdk-sp/libfaultloggerd.z.so", + "dep_file_name": "libhilog.so", + "dep_file_path": "system/lib/chipset-sdk/libhilog.so", + "description": "lib libfaultloggerd.z.so with innerapi_tags [chipsetsdk_sp_indirect,platformsdk_indirect] deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libthread_sampler.z.so", + "so_file_path": "system/lib/chipset-sdk-sp/libthread_sampler.z.so", + "dep_file_name": "libhilog.so", + "dep_file_path": "system/lib/chipset-sdk/libhilog.so", + "description": "lib libthread_sampler.z.so with innerapi_tags [chipsetsdk_sp_indirect,platformsdk_indirect] deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libeventhandler.z.so", + "so_file_path": "system/lib/chipset-sdk-sp/libeventhandler.z.so", + "dep_file_name": "libhilog.so", + "dep_file_path": "system/lib/chipset-sdk/libhilog.so", + "description": "lib libeventhandler.z.so with innerapi_tags [platformsdk,chipsetsdk_sp_indirect,sasdk] deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libeventhandler.z.so", + "so_file_path": "system/lib/chipset-sdk-sp/libeventhandler.z.so", + "dep_file_name": "libclang_rt.ubsan_minimal.so", + "dep_file_path": "system/lib/chipset-sdk/libclang_rt.ubsan_minimal.so", + "description": "lib libeventhandler.z.so with innerapi_tags [platformsdk,chipsetsdk_sp_indirect,sasdk] deps wrong lib libclang_rt.ubsan_minimal.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libdisplay_buffer_proxy_1.2.z.so", + "so_file_path": "system/lib/chipset-sdk-sp/libdisplay_buffer_proxy_1.2.z.so", + "dep_file_name": "libhilog.so", + "dep_file_path": "system/lib/chipset-sdk/libhilog.so", + "description": "lib libdisplay_buffer_proxy_1.2.z.so with innerapi_tags [chipsetsdk_sp_indirect,platformsdk_indirect] deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libipc_common.z.so", + "so_file_path": "system/lib/chipset-sdk-sp/libipc_common.z.so", + "dep_file_name": "libhilog.so", + "dep_file_path": "system/lib/chipset-sdk/libhilog.so", + "description": "lib libipc_common.z.so with innerapi_tags [chipsetsdk_sp_indirect,platformsdk_indirect] deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libipc_common.z.so", + "so_file_path": "system/lib/chipset-sdk-sp/libipc_common.z.so", + "dep_file_name": "libclang_rt.ubsan_minimal.so", + "dep_file_path": "system/lib/chipset-sdk/libclang_rt.ubsan_minimal.so", + "description": "lib libipc_common.z.so with innerapi_tags [chipsetsdk_sp_indirect,platformsdk_indirect] deps wrong lib libclang_rt.ubsan_minimal.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libdisplay_buffer_hdi_impl_v1_2.z.so", + "so_file_path": "system/lib/chipset-sdk-sp/libdisplay_buffer_hdi_impl_v1_2.z.so", + "dep_file_name": "libhilog.so", + "dep_file_path": "system/lib/chipset-sdk/libhilog.so", + "description": "lib libdisplay_buffer_hdi_impl_v1_2.z.so with innerapi_tags [chipsetsdk_sp_indirect,platformsdk_indirect] deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libasync_stack.z.so", + "so_file_path": "system/lib/chipset-sdk-sp/libasync_stack.z.so", + "dep_file_name": "libhilog.so", + "dep_file_path": "system/lib/chipset-sdk/libhilog.so", + "description": "lib libasync_stack.z.so with innerapi_tags [chipsetsdk_sp_indirect,platformsdk_indirect] deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libunwinder.z.so", + "so_file_path": "system/lib/chipset-sdk-sp/libunwinder.z.so", + "dep_file_name": "libhilog.so", + "dep_file_path": "system/lib/chipset-sdk/libhilog.so", + "description": "lib libunwinder.z.so with innerapi_tags [chipsetsdk_sp_indirect,platformsdk_indirect] deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "librockchip_mpp.z.so", + "so_file_path": "vendor/lib/passthrough/indirect/librockchip_mpp.z.so", + "dep_file_name": "libhilog.so", + "dep_file_path": "system/lib/chipset-sdk/libhilog.so", + "description": "lib librockchip_mpp.z.so with innerapi_tags [passthrough_indirect] deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "librockchip_vpu.z.so", + "so_file_path": "vendor/lib/passthrough/indirect/librockchip_vpu.z.so", + "dep_file_name": "libhilog.so", + "dep_file_path": "system/lib/chipset-sdk/libhilog.so", + "description": "lib librockchip_vpu.z.so with innerapi_tags [passthrough_indirect] deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libomxvpu_dec.z.so", + "so_file_path": "vendor/lib/passthrough/indirect/libomxvpu_dec.z.so", + "dep_file_name": "libhilog.so", + "dep_file_path": "system/lib/chipset-sdk/libhilog.so", + "description": "lib libomxvpu_dec.z.so with innerapi_tags [passthrough_indirect] deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libOMX_Core.z.so", + "so_file_path": "vendor/lib/passthrough/indirect/libOMX_Core.z.so", + "dep_file_name": "libhilog.so", + "dep_file_path": "system/lib/chipset-sdk/libhilog.so", + "description": "lib libOMX_Core.z.so with innerapi_tags [passthrough_indirect] deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "librga.z.so", + "so_file_path": "vendor/lib/passthrough/indirect/librga.z.so", + "dep_file_name": "libdrm.so", + "dep_file_path": "system/lib/chipset-sdk/libdrm.so", + "description": "lib librga.z.so with innerapi_tags [passthrough_indirect] deps wrong lib libdrm.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libusb_adapter.z.so", + "so_file_path": "vendor/lib/passthrough/indirect/libusb_adapter.z.so", + "dep_file_name": "libaccesstoken_sdk.z.so", + "dep_file_path": "system/lib/chipset-sdk/libaccesstoken_sdk.z.so", + "description": "lib libusb_adapter.z.so with innerapi_tags [passthrough_indirect] deps wrong lib libaccesstoken_sdk.z.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libusb_adapter.z.so", + "so_file_path": "vendor/lib/passthrough/indirect/libusb_adapter.z.so", + "dep_file_name": "libhilog.so", + "dep_file_path": "system/lib/chipset-sdk/libhilog.so", + "description": "lib libusb_adapter.z.so with innerapi_tags [passthrough_indirect] deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libusb_adapter.z.so", + "so_file_path": "vendor/lib/passthrough/indirect/libusb_adapter.z.so", + "dep_file_name": "libusb_shared.z.so", + "dep_file_path": "system/lib/chipset-sdk/libusb_shared.z.so", + "description": "lib libusb_adapter.z.so with innerapi_tags [passthrough_indirect] deps wrong lib libusb_shared.z.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libusb_adapter.z.so", + "so_file_path": "vendor/lib/passthrough/indirect/libusb_adapter.z.so", + "dep_file_name": "libclang_rt.ubsan_minimal.so", + "dep_file_path": "system/lib/chipset-sdk/libclang_rt.ubsan_minimal.so", + "description": "lib libusb_adapter.z.so with innerapi_tags [passthrough_indirect] deps wrong lib libclang_rt.ubsan_minimal.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libomxvpu_enc.z.so", + "so_file_path": "vendor/lib/passthrough/indirect/libomxvpu_enc.z.so", + "dep_file_name": "libhilog.so", + "dep_file_path": "system/lib/chipset-sdk/libhilog.so", + "description": "lib libomxvpu_enc.z.so with innerapi_tags [passthrough_indirect] deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libOMX_Pluginhw.z.so", + "so_file_path": "vendor/lib/passthrough/indirect/libOMX_Pluginhw.z.so", + "dep_file_name": "libhilog.so", + "dep_file_path": "system/lib/chipset-sdk/libhilog.so", + "description": "lib libOMX_Pluginhw.z.so with innerapi_tags [passthrough_indirect] deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libserial_interface_service_1.0.z.so", + "so_file_path": "vendor/lib/passthrough/indirect/libserial_interface_service_1.0.z.so", + "dep_file_name": "libhilog.so", + "dep_file_path": "system/lib/chipset-sdk/libhilog.so", + "description": "lib libserial_interface_service_1.0.z.so with innerapi_tags [passthrough_indirect] deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libserial_interface_service_1.0.z.so", + "so_file_path": "vendor/lib/passthrough/indirect/libserial_interface_service_1.0.z.so", + "dep_file_name": "libclang_rt.ubsan_minimal.so", + "dep_file_path": "system/lib/chipset-sdk/libclang_rt.ubsan_minimal.so", + "description": "lib libserial_interface_service_1.0.z.so with innerapi_tags [passthrough_indirect] deps wrong lib libclang_rt.ubsan_minimal.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libusb_host_interface_service_2.0.z.so", + "so_file_path": "vendor/lib/passthrough/indirect/libusb_host_interface_service_2.0.z.so", + "dep_file_name": "libhilog.so", + "dep_file_path": "system/lib/chipset-sdk/libhilog.so", + "description": "lib libusb_host_interface_service_2.0.z.so with innerapi_tags [passthrough_indirect] deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libusb_host_interface_service_2.0.z.so", + "so_file_path": "vendor/lib/passthrough/indirect/libusb_host_interface_service_2.0.z.so", + "dep_file_name": "libclang_rt.ubsan_minimal.so", + "dep_file_path": "system/lib/chipset-sdk/libclang_rt.ubsan_minimal.so", + "description": "lib libusb_host_interface_service_2.0.z.so with innerapi_tags [passthrough_indirect] deps wrong lib libclang_rt.ubsan_minimal.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libhdi_input.z.so", + "so_file_path": "vendor/lib/passthrough/indirect/libhdi_input.z.so", + "dep_file_name": "libhilog.so", + "dep_file_path": "system/lib/chipset-sdk/libhilog.so", + "description": "lib libhdi_input.z.so with innerapi_tags [passthrough_indirect] deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libhuks_hdi_service_1.1.z.so", + "so_file_path": "vendor/lib/passthrough/indirect/libhuks_hdi_service_1.1.z.so", + "dep_file_name": "libhilog.so", + "dep_file_path": "system/lib/chipset-sdk/libhilog.so", + "description": "lib libhuks_hdi_service_1.1.z.so with innerapi_tags [passthrough_indirect] deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libRkOMX_Resourcemanager.z.so", + "so_file_path": "vendor/lib/passthrough/indirect/libRkOMX_Resourcemanager.z.so", + "dep_file_name": "libhilog.so", + "dep_file_path": "system/lib/chipset-sdk/libhilog.so", + "description": "lib libRkOMX_Resourcemanager.z.so with innerapi_tags [passthrough_indirect] deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + } +] \ No newline at end of file diff --git a/tools/deps_guard/rules_checker/base_innerapi_rule.py b/tools/deps_guard/rules_checker/base_innerapi_rule.py index a23bd70..a157675 100644 --- a/tools/deps_guard/rules_checker/base_innerapi_rule.py +++ b/tools/deps_guard/rules_checker/base_innerapi_rule.py @@ -29,7 +29,7 @@ class BaseInnerapiRule(BaseRule): super().__init__(mgr, args) self.__ignored_tags = ["platformsdk", "sasdk", "platformsdk_indirect", "ndk"] self.__valid_system_tags = ["llndk", "chipsetsdk", "chipsetsdk_indirect", "chipsetsdk_sp" - "chipsetsdk_sp_indirect"] + self.__ignored_tags + "chipsetsdk_sp_indirect", "passthrough"] + self.__ignored_tags self.__valid_vendor_tags = ["chipsetsdk", "chipsetsdk_sp", "llndk", "passthrough", "passthrough_indirect"] + self.__ignored_tags @@ -38,10 +38,11 @@ class BaseInnerapiRule(BaseRule): if mod["path"].startswith("system"): return "system" else: - return "vendor" + return "vendor" def check(self): passed = True + white_lists = self.get_dep_whitelist() for mod in self.get_mgr().get_all(): innerapi_tags = mod["innerapi_tags"] @@ -52,12 +53,13 @@ class BaseInnerapiRule(BaseRule): callee = dep["callee"] callee_innerapi_tags = callee["innerapi_tags"] if self.is_only(self.__ignored_tags, callee) == "system" or \ - all(item in self.__valid_system_tags for item in callee_innerapi_tags): + all(item in self.__valid_system_tags for item in callee_innerapi_tags) or \ + callee["name"] in white_lists: continue else: - self.warn("NEED MODIFY: system only module %s depends on wrong module as %s in %s, dep module path is %s" + self.error("NEED MODIFY: system only module %s depends on wrong module as %s in %s, dep module path is %s" %(mod["name"], callee["name"], mod["labelPath"], callee["path"])) - passed = True + passed = False # mod is vendor only scene elif self.is_only(self.__ignored_tags, mod) == "vendor" and \ all(item in self.__valid_vendor_tags for item in innerapi_tags): @@ -65,10 +67,11 @@ class BaseInnerapiRule(BaseRule): callee = dep["callee"] callee_innerapi_tags = callee["innerapi_tags"] if self.is_only(self.__ignored_tags, callee) == "vendor" or \ - all(item in self.__valid_vendor_tags for item in callee_innerapi_tags): + all(item in self.__valid_vendor_tags for item in callee_innerapi_tags) or \ + callee["name"] in white_lists: continue else: self.error("NEED MODIFY: system only module %s depends on wrong module as %s in %s, dep module path is %s" %(mod["name"], callee["name"], mod["labelPath"], callee["path"])) - passed = True + passed = False return passed \ No newline at end of file diff --git a/tools/deps_guard/rules_checker/base_rule.py b/tools/deps_guard/rules_checker/base_rule.py index e4ae0c6..bb2a9ec 100755 --- a/tools/deps_guard/rules_checker/base_rule.py +++ b/tools/deps_guard/rules_checker/base_rule.py @@ -63,6 +63,26 @@ class BaseRule(object): def get_help_url(self): return "https://gitee.com/openharmony/developtools_integration_verification/tree/master/tools/deps_guard/rules/%s/README.md" % self.__class__.RULE_NAME + + def get_dep_whitelist(self): + whitelist_file = os.path.join(os.path.dirname(os.path.realpath(__file__)), f"../rules/dep_whitelist.json") + if os.path.exists(whitelist_file): + self.log("****dep_whitelist.json is {}****".format(whitelist_file)) + res = [] + with open(whitelist_file, "r") as f: + contents = f.read() + if not contents: + self.log("****system/vendor only whitelist.json {} is null****".format(whitelist_file)) + return res + json_data = json.loads(contents) + for so in json_data: + dep_file_name = so.get("dep_file_name") + if dep_file_name and dep_file_name not in res: + res.append(dep_file_name) + return res + else: + self.log("****dep_whitelist.json {} not exist****".format(whitelist_file)) + return [] # To be override def check(self): @@ -70,7 +90,7 @@ class BaseRule(object): return True def check_if_deps_correctly(self, check_modules, valid_mod_tags, valid_dep_tags, white_lists): - # check if mod and callee have wrong innerapi tags + # check if mod and callee have wrong innerapi tags passed = True for mod in check_modules: innerapi_tags = mod["innerapi_tags"] @@ -87,14 +107,14 @@ class BaseRule(object): if callee["name"] in white_lists: continue - passed = True + passed = False wrong_tags = [item for item in dep_innerapi_tags if item not in valid_dep_tags] - self.warn("NEED MODIFY: %s's dep file %s with %s contains wrong dep innerapi_tags [%s] in innerapi_tags [%s]" - %(mod["name"], callee["name"], callee["labelPath"], ",".join(wrong_tags), ",".join(dep_innerapi_tags))) + self.error("NEED MODIFY: %s with innerapi_tags [%s] has dep file %s with %s contains wrong dep innerapi_tags [%s] in innerapi_tags [%s]" + % (mod["name"], ",".join(innerapi_tags), callee["name"], callee["labelPath"], ",".join(wrong_tags), ",".join(dep_innerapi_tags))) else: wrong_tags = [item for item in innerapi_tags if item not in valid_mod_tags] - self.warn("NEED MODIFY: module %s with %s contains wrong mod innerapi_tags [%s] in innerapi_tags [%s]" - %(mod["name"], mod["labelPath"], ",".join(wrong_tags), ",".join(innerapi_tags))) - return True + self.error("NEED MODIFY: module %s with %s contains wrong mod innerapi_tags [%s] in innerapi_tags [%s]" + % (mod["name"], mod["path"], ",".join(wrong_tags), ",".join(innerapi_tags))) + return False return passed \ No newline at end of file diff --git a/tools/deps_guard/rules_checker/chipsetsdk.py b/tools/deps_guard/rules_checker/chipsetsdk.py index aac7edf..7bc59a5 100755 --- a/tools/deps_guard/rules_checker/chipsetsdk.py +++ b/tools/deps_guard/rules_checker/chipsetsdk.py @@ -31,9 +31,9 @@ class ChipsetSDKRule(BaseRule): self.__white_lists = self.load_chipsetsdk_json("chipsetsdk_info.json") self.__ignored_tags = ["platformsdk", "sasdk", "platformsdk_indirect", "ndk"] self.__valid_mod_tags = ["llndk", "chipsetsdk", "chipsetsdk_indirect", "chipsetsdk_sp", - "chipsetsdk_sp_indirect"] + self.__ignored_tags + "chipsetsdk_sp_indirect", "passthrough"] + self.__ignored_tags - def get_white_lists(self): + def get_sofile_list(self): return self.__white_lists def get_out_path(self): @@ -64,7 +64,7 @@ class ChipsetSDKRule(BaseRule): def check(self): self.__load_chipsetsdk_indirects() - white_lists = self.get_white_lists() + white_lists = self.get_dep_whitelist() # Check if all chipset modules depends on chipsetsdk modules only passed = self.__check_depends_on_chipsetsdk() @@ -85,7 +85,7 @@ class ChipsetSDKRule(BaseRule): return passed passed = self.check_if_deps_correctly( - self.__modules_with_chipsetsdk_tag, self.__valid_mod_tags, self.__valid_mod_tags, self.__indirects) + self.__modules_with_chipsetsdk_indirect_tag, self.__valid_mod_tags, self.__valid_mod_tags, white_lists) self.log(f"****check_if_deps_correctly indirect result:{passed}****") if not passed: return passed @@ -162,7 +162,7 @@ class ChipsetSDKRule(BaseRule): return headers def __check_depends_on_chipsetsdk(self): - lists = self.get_white_lists() + lists = self.get_sofile_list() passed = True @@ -184,6 +184,14 @@ class ChipsetSDKRule(BaseRule): if mod["path"].startswith("system"): continue + if "chipset-sdk" in mod["path"] and \ + ("chipsetsdk" not in mod["innerapi_tags"] and "chipsetsdk_indirect" not in mod["innerapi_tags"]): + # Not allowed + passed = False + self.error("NEED MODIFY: so file %s should add innerapi_tags chipsetsdk or chipsetsdk_indirect in %s" + % (mod["name"], mod["labelPath"])) + continue + # Check chipset modules depends for dep in mod["deps"]: callee = dep["callee"] @@ -210,9 +218,9 @@ class ChipsetSDKRule(BaseRule): continue # Not allowed - passed = True - self.warn("NEED MODIFY: chipset module %s in %s depends on non Chipset SDK module %s in %s" - % (mod["name"], mod["labelPath"], callee["name"], mod["labelPath"])) + passed = False + self.error("NEED MODIFY: %s in %s depends on non Chipset SDK module %s in %s" + % (mod["name"], mod["labelPath"], callee["name"], callee["labelPath"])) return passed @@ -223,14 +231,8 @@ class ChipsetSDKRule(BaseRule): self.warn('Chipset SDK module %s has no innerapi_tags with "chipsetsdk", add it in %s' % (mod["name"], mod["labelPath"])) - for mod in self.__modules_with_chipsetsdk_tag: - if mod["name"] not in self.get_white_lists(): - passed = True - self.warn('NEED MODIFY: non chipsetsdk module %s with innerapi_tags="chipsetsdk", %s' - % (mod["name"], mod["labelPath"])) - for mod in self.__modules_with_chipsetsdk_indirect_tag: - if mod["name"] not in self.__indirects and mod["name"] not in self.get_white_lists(): + if mod["name"] not in self.__indirects and mod["name"] not in self.get_sofile_list(): self.warn('non chipsetsdk_indirect module %s with innerapi_tags="chipsetsdk_indirect", %s' % (mod["name"], mod["labelPath"])) diff --git a/tools/deps_guard/rules_checker/chipsetsdk_sp.py b/tools/deps_guard/rules_checker/chipsetsdk_sp.py index aacff5c..c49c408 100644 --- a/tools/deps_guard/rules_checker/chipsetsdk_sp.py +++ b/tools/deps_guard/rules_checker/chipsetsdk_sp.py @@ -30,7 +30,9 @@ class ChipsetsdkSPRule(BaseRule): self.__out_path = mgr.get_product_out_path() self.__white_lists = self.load_chipsetsdk_json("chipsetsdk_sp_info.json") self.__ignored_tags = ["platformsdk", "sasdk", "platformsdk_indirect", "ndk"] - self.__valid_mod_tags = ["llndk", "chipsetsdk_sp", "chipsetsdk_sp_indirect"] + self.__ignored_tags + self.__valid_mod_tags = ["llndk", "chipsetsdk_sp", "chipsetsdk_sp_indirect", "passthrough"] + self.__ignored_tags + self.__valid_vendor_tags = ["chipsetsdk", "chipsetsdk_sp", "llndk", "passthrough", + "passthrougth_indirect"] + self.__ignored_tags def get_white_lists(self): return self.__white_lists @@ -63,17 +65,11 @@ class ChipsetsdkSPRule(BaseRule): def check(self): self.__load_chipsetsdk_indirects() - white_lists = self.get_white_lists() + white_lists = self.get_dep_whitelist() # Check if all chipset modules depends on chipsetsdk_sp modules only passed = self.__check_depends_on_chipsetsdk_sp() - self.log(f"****check_depends_on_chipsetsdk result:{passed}****") - if not passed: - return passed - - # Check if all chipsetsdk_sp modules are correctly tagged by innerapi_tags - passed = self.__check_if_tagged_correctly() - self.log(f"****check_if_tagged_correctly result:{passed}****") + self.log(f"****check_depends_on_chipsetsdk_sp result:{passed}****") if not passed: return passed @@ -84,7 +80,7 @@ class ChipsetsdkSPRule(BaseRule): return passed passed = self.check_if_deps_correctly( - self.__modules_with_chipsetsdk_sp_indirect_tag, self.__valid_mod_tags, self.__valid_mod_tags, self.__indirects) + self.__modules_with_chipsetsdk_sp_indirect_tag, self.__valid_mod_tags, self.__valid_mod_tags, white_lists) self.log(f"****check_if_deps_correctly indirect result:{passed}****") if not passed: return passed @@ -170,8 +166,17 @@ class ChipsetsdkSPRule(BaseRule): if self.__is_chipsetsdk_sp_indirect(mod): self.__modules_with_chipsetsdk_sp_indirect_tag.append(mod) - # Check chipset modules only - if mod["path"].startswith("system"): + if not mod["name"].endswith(".so"): + continue + + # check if all path in chipset-sdk-sp so contains sp/indirect innerapi_tags + if "chipset-sdk-sp" in mod["path"] and \ + ("chipsetsdk_sp" not in mod["innerapi_tags"] and "chipsetsdk_sp_indirect" not in mod["innerapi_tags"]): + # Not allowed + passed = False + print(f"--------------innerapi_tags: [{','.join(mod['innerapi_tags'])}]") + self.error("NEED MODIFY: so file %s should add innerapi_tags chipsetsdk_sp or chipsetsdk_sp_indirect in %s" + % (mod["name"], mod["labelPath"])) continue # Check chipset modules depends @@ -191,6 +196,13 @@ class ChipsetsdkSPRule(BaseRule): if callee["name"] in lists: continue + dep_innerapi_tags = callee["innerapi_tags"] + if dep_innerapi_tags and all(item in self.__valid_vendor_tags for item in dep_innerapi_tags): + continue + + if not dep_innerapi_tags: + continue + # If callee is asan library, it is OK if callee["name"].endswith(".asan.so"): continue @@ -200,31 +212,11 @@ class ChipsetsdkSPRule(BaseRule): continue # Not allowed - passed = True - self.warn("NEED MODIFY: chipset_sp module %s in %s depends on non ChipsetSDKSP module %s in %s" - % (mod["name"], mod["labelPath"], callee["name"], mod["labelPath"])) - - return passed - - def __check_if_tagged_correctly(self): - passed = True - for mod in self.__chipsetsdk_sps: - if not self.__is_chipsetsdk_sp_tagged(mod): - self.warn('ChipsetSDK module %s has no innerapi_tags with "chipsetsdk_sp", add it in %s' - % (mod["name"], mod["labelPath"])) - - for mod in self.__modules_with_chipsetsdk_sp_tag: - if mod["name"] not in self.get_white_lists(): - passed = True - self.warn('NEED MODIFY: non chipsetsdk_sp module %s with innerapi_tags="chipsetsdk_sp", %s' - % (mod["name"], mod["labelPath"])) - - for mod in self.__modules_with_chipsetsdk_sp_indirect_tag: - if mod["name"] not in self.__indirects and mod["name"] not in self.get_white_lists(): - self.warn('non chipsetsdk_sp_indirect module %s with innerapi_tags="chipsetsdk_sp_indirect", %s' - % (mod["name"], mod["labelPath"])) + passed = False + self.error("NEED MODIFY: chipset_sp module %s in %s depends on non ChipsetSDKSP module %s in %s" + % (mod["name"], mod["labelPath"], callee["name"], callee["labelPath"])) return passed def __load_chipsetsdk_indirects(self): - self.__indirects = self.load_chipsetsdk_json("chipsetsdk_sp_indirect.json") + self.__indirects = self.load_chipsetsdk_json("chipsetsdk_sp_indirect_info.json") diff --git a/tools/deps_guard/rules_checker/llndk.py b/tools/deps_guard/rules_checker/llndk.py index acf15cd..7be0ccb 100644 --- a/tools/deps_guard/rules_checker/llndk.py +++ b/tools/deps_guard/rules_checker/llndk.py @@ -30,7 +30,7 @@ class LLndkRule(BaseRule): self.__out_path = mgr.get_product_out_path() self.__white_lists = self.load_llndk_json("llndk_info.json") self.__ignored_tags = ["platformsdk", "sasdk", "platformsdk_indirect", "ndk"] - self.__valid_mod_tags = ["llndk"] + self.__ignored_tags + self.__valid_mod_tags = ["llndk", "passthrough"] + self.__ignored_tags def get_white_lists(self): return self.__white_lists @@ -63,11 +63,21 @@ class LLndkRule(BaseRule): def check(self): self.__modules_with_llndk_tag = [] - white_lists = self.get_white_lists() - + white_lists = self.get_dep_whitelist() + + passed = True for mod in self.get_mgr().get_all(): if self.__is_llndk_tagged(mod): self.__modules_with_llndk_tag.append(mod) + + if "llndk" in mod["path"] and "llndk" not in mod["innerapi_tags"]: + # Not allowed + self.error("NEED MODIFY: so file %s should add innerapi_tags llndk in %s" + % (mod["name"], mod["labelPath"])) + passed = False + continue + if not passed: + return passed # Check if all llndk modules are correctly tagged by innerapi_tags passed = self.__check_if_tagged_correctly() diff --git a/tools/deps_guard/rules_checker/passthrough.py b/tools/deps_guard/rules_checker/passthrough.py index 3d9115c..5eb0435 100644 --- a/tools/deps_guard/rules_checker/passthrough.py +++ b/tools/deps_guard/rules_checker/passthrough.py @@ -42,15 +42,15 @@ class PassthroughRule(BaseRule): rules_dir = [] rules_dir.append(os.path.join(os.path.dirname(os.path.realpath(__file__)), "../rules")) if self._args and self._args.rules: - self.log("****add more ChipsetSDK info in:{}****".format(self._args.rules)) + self.log("****add more passthrough info in:{}****".format(self._args.rules)) rules_dir = rules_dir + self._args.rules chipsetsdk_rules_path = self.get_out_path().replace("out", "out/products_ext") if os.path.exists(chipsetsdk_rules_path): - self.log("****add more ChipsetSDK info in dir:{}****".format(chipsetsdk_rules_path)) + self.log("****add more passthrough info in dir:{}****".format(chipsetsdk_rules_path)) rules_dir.append(chipsetsdk_rules_path) else: - self.warn("****add chipsetsdk_rules_path path not exist: {}****".format(chipsetsdk_rules_path)) + self.warn("****add passthrough_rules_path path not exist: {}****".format(chipsetsdk_rules_path)) res = [] for d in rules_dir: rules_file = os.path.join(d, self.__class__.RULE_NAME, name) @@ -63,17 +63,11 @@ class PassthroughRule(BaseRule): def check(self): self.__load_passthrough_indirects() - white_lists = self.get_white_lists() + white_lists = self.get_dep_whitelist() # Check if all chipset modules depends on chipsetsdk modules only passed = self.__check_depends_on_passthrough() - self.log(f"****check_depends_on_chipsetsdk result:{passed}****") - if not passed: - return passed - - # Check if all ChipsetSDK modules are correctly tagged by innerapi_tags - passed = self.__check_if_passthrough_tagged_correctly() - self.log(f"****check_if_tagged_correctly result:{passed}****") + self.log(f"****check_depends_on_passthrough result:{passed}****") if not passed: return passed @@ -84,12 +78,12 @@ class PassthroughRule(BaseRule): return passed passed = self.check_if_deps_correctly( - self.__modules_with_passthrough_tag, self.__valid_mod_tags, self.__valid_mod_tags, self.__indirects) + self.__modules_with_passthrough_indirect_tag, self.__valid_mod_tags, self.__valid_mod_tags, white_lists) self.log(f"****check_if_deps_correctly indirect result:{passed}****") if not passed: return passed - self.__write_innerkits_header_files() + # self.__write_innerkits_header_files() return True @@ -179,6 +173,20 @@ class PassthroughRule(BaseRule): if not mod["path"].endswith("so"): continue + if "passthrough" in mod["path"] and "passthrough" not in mod["innerapi_tags"]: + # Not allowed + passed = False + self.error("NEED MODIFY: so file %s should add innerapi_tags passthrough in %s" + % (mod["name"], mod["labelPath"])) + continue + + if "passthrough/indirect" in mod["path"] and "passthrough_indirect" not in mod["innerapi_tags"]: + # Not allowed + passed = False + self.error("NEED MODIFY: so file %s should add innerapi_tags passthrough_indirect in %s" + % (mod["name"], mod["labelPath"])) + continue + # Check chipset modules depends for dep in mod["deps"]: callee = dep["callee"] @@ -205,31 +213,11 @@ class PassthroughRule(BaseRule): continue # Not allowed - passed = True + passed = False self.error("NEED MODIFY: passthrough module %s in %s depends on non passthrough module %s in %s" - % (mod["name"], mod["labelPath"], callee["name"], mod["labelPath"])) - - return passed - - def __check_if_passthrough_tagged_correctly(self): - passed = True - for mod in self.__passthroughs: - if not self.__is_passthrough_tagged(mod): - self.warn('passthrough module %s has no innerapi_tags with "passthrough", add it in %s' - % (mod["name"], mod["labelPath"])) - - for mod in self.__modules_with_passthrough_tag: - if mod["name"] not in self.get_white_lists(): - passed = True - self.error('NEED MODIFY: non passthrough %s with innerapi_tags="passthrough", %s' - % (mod["name"], mod["labelPath"])) - - for mod in self.__modules_with_passthrough_indirect_tag: - if mod["name"] not in self.__indirects and mod["name"] not in self.get_white_lists(): - self.warn('non passthrough_indirect module %s with innerapi_tags="passthrough_indirect", %s' - % (mod["name"], mod["labelPath"])) + % (mod["name"], mod["labelPath"], callee["name"], callee["labelPath"])) return passed def __load_passthrough_indirects(self): - self.__indirects = self.load_passthrough_json("passthrough_indirect.json") + self.__indirects = self.load_passthrough_json("passthrough_indirect_info.json") -- Gitee From ee9451ae1834f7318da210f674d676365b0edffc Mon Sep 17 00:00:00 2001 From: liangxinyan Date: Mon, 8 Sep 2025 19:39:45 +0800 Subject: [PATCH 02/13] IssueNo: https://gitee.com/openharmony/developtools_integration_verification/issues/ICIF1H Signed-off-by: liangxinyan --- tools/deps_guard/elf_file_mgr/elf_file.py | 3 +- tools/deps_guard/rules/dep_whitelist.json | 21 ++++ .../rules_checker/base_innerapi_rule.py | 18 ++-- tools/deps_guard/rules_checker/chipsetsdk.py | 62 +++++------- .../deps_guard/rules_checker/chipsetsdk_sp.py | 99 ++++--------------- tools/deps_guard/rules_checker/passthrough.py | 86 +++------------- 6 files changed, 90 insertions(+), 199 deletions(-) diff --git a/tools/deps_guard/elf_file_mgr/elf_file.py b/tools/deps_guard/elf_file_mgr/elf_file.py index f119ed1..2fb315c 100755 --- a/tools/deps_guard/elf_file_mgr/elf_file.py +++ b/tools/deps_guard/elf_file_mgr/elf_file.py @@ -54,13 +54,12 @@ class ElfFile(dict): if not os.access(self._f, os.F_OK): raise Exception("Cannot find lib: " + self._f) file_name = self._f_safe.split("/")[-1].strip("'") - dynamics = command_without_error("strings", self._f_safe, f"|grep -E lib_.so|grep -v {file_name}") + dynamics = command_without_error("strings", self._f_safe, f"|grep -E '^lib([a-zA-Z0-9.]+)\.so$'|grep -v {file_name}") res = [] if dynamics: for line in dynamics: if line.startswith("lib") and line.endswith(".so"): res.append(line) - return res def __extract_soname(self): diff --git a/tools/deps_guard/rules/dep_whitelist.json b/tools/deps_guard/rules/dep_whitelist.json index a468b0b..0147c2c 100644 --- a/tools/deps_guard/rules/dep_whitelist.json +++ b/tools/deps_guard/rules/dep_whitelist.json @@ -306,5 +306,26 @@ "dep_file_name": "libhilog.so", "dep_file_path": "system/lib/chipset-sdk/libhilog.so", "description": "lib libRkOMX_Resourcemanager.z.so with innerapi_tags [passthrough_indirect] deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "all vendor lib so", + "so_file_path": "all vendor lib so", + "dep_file_name": "ld-musl-arm.so.1", + "dep_file_path": "system/lib/ld-musl-arm.so.1", + "description": "all vendor lib so deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libusb_port_interface_service_2.0.z.so", + "so_file_path": "vendor/lib/libusb_port_interface_service_2.0.z.so", + "dep_file_name": "libusb_proxy_2.0.z.so", + "dep_file_path": "system/lib/libusb_proxy_2.0.z.so", + "description": "vendor only lib vendor/lib/libusb_port_interface_service_2.0.z.so deps system lib system/lib/libusb_proxy_2.0.z.so" + }, + { + "so_file_name": "libusb_host_interface_service_2.0.z.so", + "so_file_path": "vendor/lib/passthrough/indirect/libusb_host_interface_service_2.0.z.so", + "dep_file_name": "libusb_proxy_2.0.z.so", + "dep_file_path": "system/lib/libusb_proxy_2.0.z.so", + "description": "vendor only lib vendor/lib/passthrough/indirect/libusb_host_interface_service_2.0.z.so with innerapi_tags [passthrough_indirect] deps system lib system/lib/libusb_proxy_2.0.z.so" } ] \ No newline at end of file diff --git a/tools/deps_guard/rules_checker/base_innerapi_rule.py b/tools/deps_guard/rules_checker/base_innerapi_rule.py index a157675..4e85adb 100644 --- a/tools/deps_guard/rules_checker/base_innerapi_rule.py +++ b/tools/deps_guard/rules_checker/base_innerapi_rule.py @@ -30,15 +30,17 @@ class BaseInnerapiRule(BaseRule): self.__ignored_tags = ["platformsdk", "sasdk", "platformsdk_indirect", "ndk"] self.__valid_system_tags = ["llndk", "chipsetsdk", "chipsetsdk_indirect", "chipsetsdk_sp" "chipsetsdk_sp_indirect", "passthrough"] + self.__ignored_tags - self.__valid_vendor_tags = ["chipsetsdk", "chipsetsdk_sp", "llndk", "passthrough", + self.__valid_vendor_tags = ["llndk", "chipsetsdk", "chipsetsdk_sp", "llndk", "passthrough", "passthrough_indirect"] + self.__ignored_tags - def is_only(self, ignored_tags, mod): - # check mod belongs to system module or vendor module - if mod["path"].startswith("system"): - return "system" + def is_only(self, ignored_tags, mod): + if mod["name"].endswith(".so") or mod["name"].endswith(".so.1"): + if mod["path"].startswith("system"): + return "system" + else: + return "vendor" else: - return "vendor" + return "" def check(self): passed = True @@ -53,7 +55,7 @@ class BaseInnerapiRule(BaseRule): callee = dep["callee"] callee_innerapi_tags = callee["innerapi_tags"] if self.is_only(self.__ignored_tags, callee) == "system" or \ - all(item in self.__valid_system_tags for item in callee_innerapi_tags) or \ + (callee_innerapi_tags and all(item in self.__valid_system_tags for item in callee_innerapi_tags)) or \ callee["name"] in white_lists: continue else: @@ -67,7 +69,7 @@ class BaseInnerapiRule(BaseRule): callee = dep["callee"] callee_innerapi_tags = callee["innerapi_tags"] if self.is_only(self.__ignored_tags, callee) == "vendor" or \ - all(item in self.__valid_vendor_tags for item in callee_innerapi_tags) or \ + (callee_innerapi_tags and all(item in self.__valid_vendor_tags for item in callee_innerapi_tags)) or \ callee["name"] in white_lists: continue else: diff --git a/tools/deps_guard/rules_checker/chipsetsdk.py b/tools/deps_guard/rules_checker/chipsetsdk.py index 7bc59a5..7ca3b1f 100755 --- a/tools/deps_guard/rules_checker/chipsetsdk.py +++ b/tools/deps_guard/rules_checker/chipsetsdk.py @@ -63,20 +63,15 @@ class ChipsetSDKRule(BaseRule): return res def check(self): + self.__load_chipsetsdks() self.__load_chipsetsdk_indirects() white_lists = self.get_dep_whitelist() # Check if all chipset modules depends on chipsetsdk modules only - passed = self.__check_depends_on_chipsetsdk() + passed = self.__check_tags_correctly() self.log(f"****check_depends_on_chipsetsdk result:{passed}****") if not passed: return passed - - # Check if all ChipsetSDK modules are correctly tagged by innerapi_tags - passed = self.__check_if_tagged_correctly() - self.log(f"****check_if_tagged_correctly result:{passed}****") - if not passed: - return passed passed = self.check_if_deps_correctly( self.__modules_with_chipsetsdk_tag, self.__valid_mod_tags, self.__valid_mod_tags, white_lists) @@ -133,7 +128,7 @@ class ChipsetSDKRule(BaseRule): info = json.load(f) headers = [] - for sdk in self.__chipsetsdks: + for sdk in self.__chipsetsdk_mods: path = sdk["labelPath"][:sdk["labelPath"].find(":")] target_name = sdk["labelPath"][sdk["labelPath"].find(":") + 1:] item = {"name": sdk["componentName"] + ":" + target_name, "so_file_name": @@ -161,12 +156,12 @@ class ChipsetSDKRule(BaseRule): return headers - def __check_depends_on_chipsetsdk(self): - lists = self.get_sofile_list() + def __check_tags_correctly(self): + lists = self.get_dep_whitelist() passed = True - self.__chipsetsdks = [] + self.__chipsetsdk_mods = [] self.__modules_with_chipsetsdk_tag = [] self.__modules_with_chipsetsdk_indirect_tag = [] @@ -184,13 +179,18 @@ class ChipsetSDKRule(BaseRule): if mod["path"].startswith("system"): continue - if "chipset-sdk" in mod["path"] and \ - ("chipsetsdk" not in mod["innerapi_tags"] and "chipsetsdk_indirect" not in mod["innerapi_tags"]): - # Not allowed - passed = False - self.error("NEED MODIFY: so file %s should add innerapi_tags chipsetsdk or chipsetsdk_indirect in %s" - % (mod["name"], mod["labelPath"])) + # If callee is chipset module, it is OK + if not mod["path"].endswith(".so"): continue + + # Check if all chipsetsdk/chisetsdk_indirect module are tagged correctly + if "chipset-sdk/" in mod["path"]: + if mod["name"] not in self.__chipsetsdks and mod["name"] not in self.__indirects: + # Not allowed + passed = False + self.error("NEED MODIFY: so file %s should be add in file chipsetsdk_info.json or chipsetsdk_indirect_info.json" + % (mod["name"])) + continue # Check chipset modules depends for dep in mod["deps"]: @@ -201,9 +201,13 @@ class ChipsetSDKRule(BaseRule): continue # Add to list - if callee not in self.__chipsetsdks: + if callee not in self.__chipsetsdk_mods: if "hdiType" not in callee or callee["hdiType"] != "hdi_proxy": - self.__chipsetsdks.append(callee) + self.__chipsetsdk_mods.append(callee) + + # If callee is chipset module, it is OK + if not callee["path"].endswith(".so"): + continue # If callee is in Chipset SDK white list module, it is OK if callee["name"] in lists: @@ -217,26 +221,10 @@ class ChipsetSDKRule(BaseRule): if "hdiType" in callee and callee["hdiType"] == "hdi_proxy": continue - # Not allowed - passed = False - self.error("NEED MODIFY: %s in %s depends on non Chipset SDK module %s in %s" - % (mod["name"], mod["labelPath"], callee["name"], callee["labelPath"])) - return passed - def __check_if_tagged_correctly(self): - passed = True - for mod in self.__chipsetsdks: - if not self.__is_chipsetsdk_tagged(mod): - self.warn('Chipset SDK module %s has no innerapi_tags with "chipsetsdk", add it in %s' - % (mod["name"], mod["labelPath"])) - - for mod in self.__modules_with_chipsetsdk_indirect_tag: - if mod["name"] not in self.__indirects and mod["name"] not in self.get_sofile_list(): - self.warn('non chipsetsdk_indirect module %s with innerapi_tags="chipsetsdk_indirect", %s' - % (mod["name"], mod["labelPath"])) - - return passed + def __load_chipsetsdks(self): + self.__chipsetsdks = self.load_chipsetsdk_json("chipsetsdk_info.json") def __load_chipsetsdk_indirects(self): self.__indirects = self.load_chipsetsdk_json("chipsetsdk_indirect.json") diff --git a/tools/deps_guard/rules_checker/chipsetsdk_sp.py b/tools/deps_guard/rules_checker/chipsetsdk_sp.py index c49c408..de0dd57 100644 --- a/tools/deps_guard/rules_checker/chipsetsdk_sp.py +++ b/tools/deps_guard/rules_checker/chipsetsdk_sp.py @@ -31,8 +31,6 @@ class ChipsetsdkSPRule(BaseRule): self.__white_lists = self.load_chipsetsdk_json("chipsetsdk_sp_info.json") self.__ignored_tags = ["platformsdk", "sasdk", "platformsdk_indirect", "ndk"] self.__valid_mod_tags = ["llndk", "chipsetsdk_sp", "chipsetsdk_sp_indirect", "passthrough"] + self.__ignored_tags - self.__valid_vendor_tags = ["chipsetsdk", "chipsetsdk_sp", "llndk", "passthrough", - "passthrougth_indirect"] + self.__ignored_tags def get_white_lists(self): return self.__white_lists @@ -64,7 +62,8 @@ class ChipsetsdkSPRule(BaseRule): return res def check(self): - self.__load_chipsetsdk_indirects() + self.__load_chipsetsdk_sps() + self.__load_chipsetsdk_sp_indirects() white_lists = self.get_dep_whitelist() # Check if all chipset modules depends on chipsetsdk_sp modules only @@ -85,8 +84,6 @@ class ChipsetsdkSPRule(BaseRule): if not passed: return passed - self.__write_innerkits_header_files() - return True def __parser_rules_file(self, rules_file, res): @@ -121,41 +118,12 @@ class ChipsetsdkSPRule(BaseRule): return True return False - def __write_innerkits_header_files(self): - inner_kits_info = os.path.join(self.get_mgr().get_product_out_path(), - "build_configs/parts_info/inner_kits_info.json") - with open(inner_kits_info, "r") as f: - info = json.load(f) - - headers = [] - for sdk in self.__chipsetsdk_sps: - path = sdk["labelPath"][:sdk["labelPath"].find(":")] - target_name = sdk["labelPath"][sdk["labelPath"].find(":") + 1:] - item = {"name": sdk["componentName"] + ":" + target_name, "so_file_name": - sdk["name"], "path": sdk["labelPath"], "headers": []} - if sdk["componentName"] not in info: - headers.append(item) - continue - - for name, innerapi in info[sdk["componentName"]].items(): - if innerapi["label"] != sdk["labelPath"]: - continue - got_headers = True - base = innerapi["header_base"] - for f in innerapi["header_files"]: - item["headers"].append(os.path.join(base, f)) - headers.append(item) - return headers - def __check_depends_on_chipsetsdk_sp(self): - lists = self.get_white_lists() - - passed = True - - self.__chipsetsdk_sps = [] self.__modules_with_chipsetsdk_sp_tag = [] self.__modules_with_chipsetsdk_sp_indirect_tag = [] + passed = True + # Check if any napi modules has dependedBy for mod in self.get_mgr().get_all(): # Collect all modules with chipsetsdk_sp tag @@ -170,53 +138,20 @@ class ChipsetsdkSPRule(BaseRule): continue # check if all path in chipset-sdk-sp so contains sp/indirect innerapi_tags - if "chipset-sdk-sp" in mod["path"] and \ - ("chipsetsdk_sp" not in mod["innerapi_tags"] and "chipsetsdk_sp_indirect" not in mod["innerapi_tags"]): - # Not allowed - passed = False - print(f"--------------innerapi_tags: [{','.join(mod['innerapi_tags'])}]") - self.error("NEED MODIFY: so file %s should add innerapi_tags chipsetsdk_sp or chipsetsdk_sp_indirect in %s" - % (mod["name"], mod["labelPath"])) - continue - - # Check chipset modules depends - for dep in mod["deps"]: - callee = dep["callee"] - - # If callee is chipset module, it is OK - if not callee["path"].startswith("system"): + if "chipset-sdk-sp" in mod["path"]: + if mod["name"] not in self.__chipsetsdks and mod["name"] not in self.__indirects: + # Not allowed + passed = False + self.error("NEED MODIFY: so file %s should be add in file chipsetsdk_sp_info.json or chipsetsdk_sp_indirect_info.json" + % (mod["name"])) continue - - # Add to list - if callee not in self.__chipsetsdk_sps: - if "hdiType" not in callee or callee["hdiType"] != "hdi_proxy": - self.__chipsetsdk_sps.append(callee) - - # If callee is in ChipsetSDKSP white list module, it is OK - if callee["name"] in lists: - continue - - dep_innerapi_tags = callee["innerapi_tags"] - if dep_innerapi_tags and all(item in self.__valid_vendor_tags for item in dep_innerapi_tags): - continue - - if not dep_innerapi_tags: - continue - - # If callee is asan library, it is OK - if callee["name"].endswith(".asan.so"): - continue - - # If callee is hdi proxy module, it is OK - if "hdiType" in callee and callee["hdiType"] == "hdi_proxy": - continue - - # Not allowed - passed = False - self.error("NEED MODIFY: chipset_sp module %s in %s depends on non ChipsetSDKSP module %s in %s" - % (mod["name"], mod["labelPath"], callee["name"], callee["labelPath"])) - + return passed + + def __load_chipsetsdk_sps(self): + self.__chipsetsdks = self.load_chipsetsdk_json("chipsetsdk_sp_info.json") + print(f"chipsetsdk_sps: {', '.join(self.__chipsetsdks)}") - def __load_chipsetsdk_indirects(self): + def __load_chipsetsdk_sp_indirects(self): self.__indirects = self.load_chipsetsdk_json("chipsetsdk_sp_indirect_info.json") + print(f"chipsetsdk_sps: {', '.join(self.__indirects)}") diff --git a/tools/deps_guard/rules_checker/passthrough.py b/tools/deps_guard/rules_checker/passthrough.py index 5eb0435..980f00b 100644 --- a/tools/deps_guard/rules_checker/passthrough.py +++ b/tools/deps_guard/rules_checker/passthrough.py @@ -62,6 +62,7 @@ class PassthroughRule(BaseRule): return res def check(self): + self.__load_passthroughs() self.__load_passthrough_indirects() white_lists = self.get_dep_whitelist() @@ -83,8 +84,6 @@ class PassthroughRule(BaseRule): if not passed: return passed - # self.__write_innerkits_header_files() - return True def __parser_rules_file(self, rules_file, res): @@ -119,36 +118,7 @@ class PassthroughRule(BaseRule): return True return False - def __write_innerkits_header_files(self): - inner_kits_info = os.path.join(self.get_mgr().get_product_out_path(), - "build_configs/parts_info/inner_kits_info.json") - with open(inner_kits_info, "r") as f: - info = json.load(f) - - headers = [] - for sdk in self.__passthroughs: - path = sdk["labelPath"][:sdk["labelPath"].find(":")] - target_name = sdk["labelPath"][sdk["labelPath"].find(":") + 1:] - item = {"name": sdk["componentName"] + ":" + target_name, "so_file_name": - sdk["name"], "path": sdk["labelPath"], "headers": []} - if sdk["componentName"] not in info: - headers.append(item) - continue - - for name, innerapi in info[sdk["componentName"]].items(): - if innerapi["label"] != sdk["labelPath"]: - continue - got_headers = True - base = innerapi["header_base"] - for f in innerapi["header_files"]: - item["headers"].append(os.path.join(base, f)) - headers.append(item) - - return headers - def __check_depends_on_passthrough(self): - lists = self.get_white_lists() - passed = True self.__passthroughs = [] @@ -173,51 +143,27 @@ class PassthroughRule(BaseRule): if not mod["path"].endswith("so"): continue - if "passthrough" in mod["path"] and "passthrough" not in mod["innerapi_tags"]: - # Not allowed - passed = False - self.error("NEED MODIFY: so file %s should add innerapi_tags passthrough in %s" - % (mod["name"], mod["labelPath"])) - continue - - if "passthrough/indirect" in mod["path"] and "passthrough_indirect" not in mod["innerapi_tags"]: - # Not allowed - passed = False - self.error("NEED MODIFY: so file %s should add innerapi_tags passthrough_indirect in %s" - % (mod["name"], mod["labelPath"])) - continue - - # Check chipset modules depends - for dep in mod["deps"]: - callee = dep["callee"] - - # If callee is chipset module, it is OK - if not callee["path"].startswith("vendor"): + if "passthrough" in mod["path"] and "passthrough/indirect" not in mod["path"]: + if mod["name"] not in self.__passthroughs: + # Not allowed + passed = False + self.error("NEED MODIFY: so file %s should add innerapi_tags passthrough or passthrough_indirect in %s" + % (mod["name"], mod["labelPath"])) continue - # Add to list - if callee not in self.__passthroughs: - if "hdiType" not in callee or callee["hdiType"] != "hdi_proxy": - self.__passthroughs.append(callee) - - # If callee is in passthroughwhite list module, it is OK - if callee["name"] in lists: + if "passthrough/indirect" in mod["path"]: + if mod["name"] not in self.__indirects: + # Not allowed + passed = False + self.error("NEED MODIFY: so file %s should add innerapi_tags passthrough_indirect in %s" + % (mod["name"], mod["labelPath"])) continue - # If callee is asan library, it is OK - if callee["name"].endswith(".asan.so"): - continue - - # If callee is hdi proxy module, it is OK - if "hdiType" in callee and callee["hdiType"] == "hdi_proxy": - continue + return passed - # Not allowed - passed = False - self.error("NEED MODIFY: passthrough module %s in %s depends on non passthrough module %s in %s" - % (mod["name"], mod["labelPath"], callee["name"], callee["labelPath"])) + def __load_passthroughs(self): + self.__passthroughs = self.load_passthrough_json("passthrough_indirect_info.json") - return passed def __load_passthrough_indirects(self): self.__indirects = self.load_passthrough_json("passthrough_indirect_info.json") -- Gitee From 7505f658c27fc42241d67a481ec5144c71845909 Mon Sep 17 00:00:00 2001 From: liangxinyan Date: Mon, 8 Sep 2025 20:22:20 +0800 Subject: [PATCH 03/13] IssueNo: https://gitee.com/openharmony/developtools_integration_verification/issues/ICIF1H Signed-off-by: liangxinyan --- tools/deps_guard/rules_checker/chipsetsdk.py | 4 ++-- tools/deps_guard/rules_checker/chipsetsdk_sp.py | 6 ++---- tools/deps_guard/rules_checker/passthrough.py | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tools/deps_guard/rules_checker/chipsetsdk.py b/tools/deps_guard/rules_checker/chipsetsdk.py index 7ca3b1f..19e6316 100755 --- a/tools/deps_guard/rules_checker/chipsetsdk.py +++ b/tools/deps_guard/rules_checker/chipsetsdk.py @@ -188,8 +188,8 @@ class ChipsetSDKRule(BaseRule): if mod["name"] not in self.__chipsetsdks and mod["name"] not in self.__indirects: # Not allowed passed = False - self.error("NEED MODIFY: so file %s should be add in file chipsetsdk_info.json or chipsetsdk_indirect_info.json" - % (mod["name"])) + self.error("NEED MODIFY: so file %s in %s should be add in file chipsetsdk_info.json or chipsetsdk_indirect_info.json" + % (mod["name"], mod["labelPath"])) continue # Check chipset modules depends diff --git a/tools/deps_guard/rules_checker/chipsetsdk_sp.py b/tools/deps_guard/rules_checker/chipsetsdk_sp.py index de0dd57..301f191 100644 --- a/tools/deps_guard/rules_checker/chipsetsdk_sp.py +++ b/tools/deps_guard/rules_checker/chipsetsdk_sp.py @@ -142,16 +142,14 @@ class ChipsetsdkSPRule(BaseRule): if mod["name"] not in self.__chipsetsdks and mod["name"] not in self.__indirects: # Not allowed passed = False - self.error("NEED MODIFY: so file %s should be add in file chipsetsdk_sp_info.json or chipsetsdk_sp_indirect_info.json" - % (mod["name"])) + self.error("NEED MODIFY: so file %s in %s should be add in file chipsetsdk_sp_info.json or chipsetsdk_sp_indirect_info.json" + % (mod["name"], mod["labelPath"])) continue return passed def __load_chipsetsdk_sps(self): self.__chipsetsdks = self.load_chipsetsdk_json("chipsetsdk_sp_info.json") - print(f"chipsetsdk_sps: {', '.join(self.__chipsetsdks)}") def __load_chipsetsdk_sp_indirects(self): self.__indirects = self.load_chipsetsdk_json("chipsetsdk_sp_indirect_info.json") - print(f"chipsetsdk_sps: {', '.join(self.__indirects)}") diff --git a/tools/deps_guard/rules_checker/passthrough.py b/tools/deps_guard/rules_checker/passthrough.py index 980f00b..033bbed 100644 --- a/tools/deps_guard/rules_checker/passthrough.py +++ b/tools/deps_guard/rules_checker/passthrough.py @@ -147,7 +147,7 @@ class PassthroughRule(BaseRule): if mod["name"] not in self.__passthroughs: # Not allowed passed = False - self.error("NEED MODIFY: so file %s should add innerapi_tags passthrough or passthrough_indirect in %s" + self.error("NEED MODIFY: so file %s should be add in file passthrough_info.json" % (mod["name"], mod["labelPath"])) continue @@ -155,7 +155,7 @@ class PassthroughRule(BaseRule): if mod["name"] not in self.__indirects: # Not allowed passed = False - self.error("NEED MODIFY: so file %s should add innerapi_tags passthrough_indirect in %s" + self.error("NEED MODIFY: so file %s in %s should be add in file passthrough_indirect_info.json" % (mod["name"], mod["labelPath"])) continue -- Gitee From 03f47376f05a8ee02fed2059a9d4283e1e8d90bd Mon Sep 17 00:00:00 2001 From: liangxinyan123 Date: Tue, 9 Sep 2025 00:53:37 +0000 Subject: [PATCH 04/13] update tools/deps_guard/rules/ChipsetsdkSP/chipsetsdk_sp_info.json. Signed-off-by: liangxinyan123 --- .../rules/ChipsetSDK/chipsetsdk_indirect.json | 341 ++---------------- .../rules/ChipsetSDK/chipsetsdk_info.json | 6 - .../ChipsetsdkSP/chipsetsdk_sp_info.json | 6 + .../passthrough_indirect_info.json | 6 - .../rules/Passthrough/passthrough_info.json | 6 + tools/deps_guard/rules_checker/chipsetsdk.py | 24 ++ .../deps_guard/rules_checker/chipsetsdk_sp.py | 24 ++ tools/deps_guard/rules_checker/passthrough.py | 25 ++ 8 files changed, 108 insertions(+), 330 deletions(-) diff --git a/tools/deps_guard/rules/ChipsetSDK/chipsetsdk_indirect.json b/tools/deps_guard/rules/ChipsetSDK/chipsetsdk_indirect.json index 3b516a0..af36a12 100755 --- a/tools/deps_guard/rules/ChipsetSDK/chipsetsdk_indirect.json +++ b/tools/deps_guard/rules/ChipsetSDK/chipsetsdk_indirect.json @@ -1,81 +1,15 @@ [ { - "name": "drivers_interface_display:libdisplay_buffer_proxy_1.0", - "so_file_name": "libdisplay_buffer_proxy_1.0.z.so", - "path": "//drivers/interface/display/buffer/v1_0:libdisplay_buffer_proxy_1.0", - "headers": [ - "//drivers/hdf_core/adapter/uhdf2/include/hdi/", - "//drivers/hdf_core/adapter/uhdf2/osal/include/", - "//drivers/hdf_core/adapter/uhdf2/ipc/include/", - "//drivers/hdf_core/framework/include/utils/", - "//drivers/hdf_core/interfaces/inner_api/utils/", - "//drivers/hdf_core/interfaces/inner_api/osal/uhdf/", - "//drivers/hdf_core/interfaces/inner_api/hdi/" - ] - }, - { - "name": "drivers_interface_display:libdisplay_buffer_proxy_1.2", - "so_file_name": "libdisplay_buffer_proxy_1.2.z.so", - "path": "//drivers/interface/display/buffer/v1_2:libdisplay_buffer_proxy_1.2", - "headers": [ - "//drivers/hdf_core/adapter/uhdf2/include/hdi/", - "//drivers/hdf_core/adapter/uhdf2/osal/include/", - "//drivers/hdf_core/adapter/uhdf2/ipc/include/", - "//drivers/hdf_core/framework/include/utils/", - "//drivers/hdf_core/interfaces/inner_api/utils/", - "//drivers/hdf_core/interfaces/inner_api/osal/uhdf/", - "//drivers/hdf_core/interfaces/inner_api/hdi/" - ] - }, - { - "name": "eventhandler:libeventhandler", - "so_file_name": "libeventhandler.z.so", - "path": "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "headers": [ - "//base/notification/eventhandler/interfaces/inner_api/" - ] - }, - { - "name": "selinux:libselinux", - "so_file_name": "libselinux.z.so", - "path": "//third_party/selinux:libselinux", - "headers": [ - "//third_party/selinux/libselinux/include/", - "//third_party/selinux/libselinux/", - "//third_party/pcre2/pcre2/src/", - "//third_party/FreeBSD/" - ] - }, - { - "name": "pcre2:libpcre2", - "so_file_name": "libpcre2.z.so", - "path": "//third_party/pcre2:libpcre2", + "name": "access_token:accesstoken_common_cxx", + "so_file_name": "libaccesstoken_common_cxx.z.so", + "path": "//base/security/access_token/frameworks/common:accesstoken_common_cxx", "headers": [] }, { - "name": "drivers_interface_display:libdisplay_buffer_hdi_impl", - "so_file_name": "libdisplay_buffer_hdi_impl.z.so", - "path": "//drivers/interface/display/buffer/v1_0:libdisplay_buffer_hdi_impl", - "headers": [ - "//drivers/interface/display/buffer/" - ] - }, - { - "name": "drivers_interface_display:libdisplay_buffer_hdi_impl_v1_2", - "so_file_name": "libdisplay_buffer_hdi_impl_v1_2.z.so", - "path": "//drivers/interface/display/buffer/v1_2:libdisplay_buffer_hdi_impl_v1_2", - "headers": [ - "//drivers/interface/display/buffer/" - ] - }, - { - "name": "ipc:ipc_common", - "so_file_name": "libipc_common.z.so", - "path": "//foundation/communication/ipc/ipc/native/src/core:ipc_common", - "headers": [ - "//commonlibrary/c_utils/base/include/", - "//third_party/bounds_checking_function/include/" - ] + "name": "ability_base:extractortool", + "so_file_name": "libextractortool.z.so", + "path": "//foundation/ability/ability_base:extractortool", + "headers": [] }, { "name": "nghttp2:libnghttp2_shared", @@ -84,196 +18,39 @@ "headers": [] }, { - "name": "brotli:brotli_shared", - "so_file_name": "libbrotli_shared.z.so", - "path": "//third_party/brotli:brotli_shared", + "name": "hiview:libfaultlogger", + "so_file_name": "libfaultlogger.z.so", + "path": "//base/hiviewdfx/hiview/plugins/faultlogger:libfaultlogger", "headers": [] }, - { - "name": "access_token:libtokenid_sdk", - "so_file_name": "libtokenid_sdk.z.so", - "path": "//base/security/access_token/interfaces/innerkits/accesstoken:libtokenid_sdk", - "headers": [ - "//base/security/access_token/interfaces/innerkits/accesstoken/include/" - ] - }, { "name": "access_token:accesstoken_communication_adapter_cxx", "so_file_name": "libaccesstoken_communication_adapter_cxx.z.so", "path": "//base/security/access_token/frameworks/accesstoken:accesstoken_communication_adapter_cxx", - "headers": [ - "//base/security/access_token/frameworks/accesstoken/include/", - "//base/security/access_token/frameworks/common/include/", - "//base/security/access_token/interfaces/innerkits/accesstoken/include/" - ] - }, - { - "name": "access_token:accesstoken_common_cxx", - "so_file_name": "libaccesstoken_common_cxx.z.so", - "path": "//base/security/access_token/frameworks/common:accesstoken_common_cxx", - "headers": [ - "//base/security/access_token/frameworks/common/include/" - ] - }, - { - "name": "dsoftbus:softbus_client", - "so_file_name": "libsoftbus_client.z.so", - "path": "//foundation/communication/dsoftbus/sdk:softbus_client", - "headers": [ - "//foundation/communication/dsoftbus/interfaces/kits/", - "//foundation/communication/dsoftbus/interfaces/kits/bus_center/", - "//foundation/communication/dsoftbus/interfaces/kits/common/", - "//foundation/communication/dsoftbus/interfaces/kits/discovery/", - "//foundation/communication/dsoftbus/interfaces/kits/transport/", - "//foundation/communication/dsoftbus/sdk/transmission/session/cpp/include/", - "//foundation/communication/dsoftbus/interfaces/inner_kits/transport/", - "//foundation/communication/dsoftbus/core/common/dfx/hisysevent_adapter/include/", - "//third_party/bounds_checking_function/include/", - "//commonlibrary/c_utils/base/include/", - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include/", - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/encode/include/", - "//third_party/bounds_checking_function/include/" - ] - }, - { - "name": "samgr:samgr_common", - "so_file_name": "libsamgr_common.z.so", - "path": "//foundation/systemabilitymgr/samgr/interfaces/innerkits/common:samgr_common", - "headers": [ - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/common/include/", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include/", - "//foundation/systemabilitymgr/samgr/services/dfx/include/" - ] - }, - { - "name": "mbedtls:mbedtls_shared", - "so_file_name": "libmbedtls.z.so", - "path": "//third_party/mbedtls:mbedtls_shared", - "headers": [ - "//third_party/mbedtls/include/", - "//third_party/mbedtls/library/", - "//third_party/mbedtls/include/mbedtls/", - "//third_party/mbedtls/tests/include/", - "//third_party/mbedtls/port/config/compat_posix/" - ] - }, - { - "name": "dsoftbus:FillpSo", - "so_file_name": "libFillpSo.z.so", - "path": "//foundation/communication/dsoftbus/components/nstackx_enhanced/fillp:FillpSo", - "headers": [] - }, - { - "name": "dsoftbus:nstackx_dfile", - "so_file_name": "libnstackx_dfile.z.so", - "path": "//foundation/communication/dsoftbus/components/nstackx_enhanced/nstackx_core:nstackx_dfile", - "headers": [] - }, - { - "name": "dsoftbus:softbus_adapter", - "so_file_name": "libsoftbus_adapter.z.so", - "path": "//foundation/communication/dsoftbus/adapter:softbus_adapter", - "headers": [ - "//foundation/communication/dsoftbus/adapter/common/include/", - "//foundation/communication/dsoftbus/adapter/common/include/OS_adapter_define/linux/", - "//foundation/communication/dsoftbus/adapter/default_config/spec_config/", - "//foundation/communication/dsoftbus/core/common/include/", - "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/", - "//third_party/openssl/include/" - ] - }, - { - "name": "dsoftbus:softbus_utils", - "so_file_name": "libsoftbus_utils.z.so", - "path": "//foundation/communication/dsoftbus/core/common:softbus_utils", - "headers": [ - "//foundation/communication/dsoftbus/core/common/include/", - "//foundation/communication/dsoftbus/core/common/dfx/hidumper_adapter/include/", - "//foundation/communication/dsoftbus/core/common/dfx/hisysevent_adapter/include/", - "//foundation/communication/dsoftbus/interfaces/kits/common/", - "//foundation/communication/dsoftbus/adapter/common/include/", - "//foundation/communication/dsoftbus/components/nstackx/nstackx_core/dfile/interface/", - "//foundation/communication/dsoftbus/core/connection/interface/", - "//foundation/communication/dsoftbus/core/connection/common/include/", - "//foundation/communication/dsoftbus/core/connection/manager/", - "//foundation/communication/dsoftbus/core/transmission/trans_channel/proxy/include/", - "//foundation/communication/dsoftbus/core/transmission/common/include/", - "//foundation/communication/dsoftbus/interfaces/kits/transport/", - "//foundation/communication/dsoftbus/adapter/common/include/", - "//foundation/communication/dsoftbus/adapter/common/include/OS_adapter_define/linux/", - "//foundation/communication/dsoftbus/adapter/default_config/spec_config/", - "//foundation/communication/dsoftbus/core/common/include/", - "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/", - "//third_party/openssl/include/", - "//third_party/cJSON/", - "//third_party/sqlite/include/", - "//commonlibrary/c_utils/base/include/", - "//foundation/communication/dsoftbus/components/nstackx/nstackx_ctrl/interface/", - "//foundation/communication/dsoftbus/components/nstackx/nstackx_util/interface/", - "//foundation/communication/dsoftbus/components/nstackx/nstackx_util/platform/unix/" - ] - }, - { - "name": "dsoftbus:nstackx_congestion", - "so_file_name": "libnstackx_congestion.z.so", - "path": "//foundation/communication/dsoftbus/components/nstackx_enhanced/nstackx_congestio:nstackx_congestionn", "headers": [] }, { - "name": "algorithm:msdp_ble_range", - "so_file_name": "libmsdp_ble_range.z.so", - "path": "//base/msdp/algorithm/ble_range:msdp_ble_range", + "name": "drivers_interface_display:libdisplay_buffer_proxy_1.3", + "so_file_name": "libdisplay_buffer_proxy_1.3.z.so", + "path": "//drivers/interface/display/buffer/v1_3:libdisplay_buffer_proxy_1.3", "headers": [] }, { - "name": "sqlite:sqlite", - "so_file_name": "libsqlite.z.so", - "path": "//third_party/sqlite:sqlite", - "headers": [ - "//third_party/sqlite/include/", - "//commonlibrary/c_utils/base/include/" - ] - }, - { - "name": "dsoftbus:nstackx_util", - "so_file_name": "libnstackx_util.z.so", - "path": "//foundation/communication/dsoftbus/componets/nstackx_enhanced/nstackx_util:nstackx_util", + "name": "pulseaudio:pulsecore", + "so_file_name": "libpulsecore.z.so", + "path": "//third_party/pulseaudio/ohosbuild/src/pulsecore:pulsecore", "headers": [] }, { - "name": "faultloggerd:libdfx_dumpcatcher", - "so_file_name": "libdfx_dumpcatcher.z.so", - "path": "//base/hiviewdfx/faultloggerd/interfaces/innerkits/dump_catcher:libdfx_dumpcatcher", - "headers": [ - "//base/hiviewdfx/faultloggerd/interfaces/innerkits/dump_catcher/include/" - ] - }, - { - "name": "faultloggerd:libdfx_procinfo", - "so_file_name": "libdfx_procinfo.z.so", - "path": "//base/hiviewdfx/faultloggerd/interfaces/innerkits/procinfo:libdfx_proinfo", + "name": "brotli:brotli_shared", + "so_file_name": "libbrotli_shared.z.so", + "path": "//third_party/brotli:brotli_shared", "headers": [] }, { - "name": "hiview:libucollection_client", - "so_file_name": "libucollection_client.z.so", - "path": "//base/hiviewdfx/hiview/interfaces/inner_api/unified_collection/client:libucollection_client", - "headers": [ - "//base/hiviewdfx/hiview/interfaces/inner_api/unified_collection/" - ] - }, - { - "name": "storage_service:storage_manager_acl", - "so_file_name": "libstorage_manager_acl.z.so", - "path": "//foundation/filemanagement/storage_service/interfaces/innerkits/acl/native:storage_manager_acl", - "headers": [ - "//foundation/filemanagement/storage_service/interfaces/innerkits/acl/native/" - ] - }, - { - "name": "faultloggerd:libasync_stack", - "so_file_name": "libasync_stack.z.so", - "path": "//base/hiviewdfx/faultloggerd/interfaces/innerkits/async_stack:libasync_stack", + "name": "pulseaudio:pulsecommon", + "so_file_name": "libpulsecommon.z.so", + "path": "//third_party/pulseaudio/ohosbuild/src:pulsecommon", "headers": [] }, { @@ -282,82 +59,10 @@ "path": "//base/hiviewdfx/faultloggerd/interfaces/innerkits/crash_exception:crash_exception", "headers": [] }, - { - "name": "faultloggerd:dfx_signalhandler", - "so_file_name": "libdfx_signalhandler.z.so", - "path": "//base/hiviewdfx/faultloggerd/interfaces/innerkits/signal_handler:dfx_signalhandler", - "headers": [] - }, - { - "name": "hicollie:libfaultlogger", - "so_file_name": "libfaultlogger.z.so", - "path": "//base/hiviewdfx/hiview/plugins/faultloggerd:libfaultlogger", - "headers": [] - }, - { - "name": "drivers_interface_display:libdisplay_buffer_hdi_impl_v1_1", - "so_file_name": "libdisplay_buffer_hdi_impl_v1_1.z.so", - "path": "//drivers/interface/display/buffer/v1_1:libdisplay_buffer_hdi_impl_v1_1", - "headers": [] - }, - { - "name": "drivers_interface_display:libdisplay_buffer_proxy_1.1", - "so_file_name": "libdisplay_buffer_proxy_1.1.z.so", - "path": "//drivers/interface/display/buffer/v1_1:libdisplay_buffer_proxy_1.1", - "headers": [] - }, - { - "name": "ability_base:extractortool", - "so_file_name": "libextractortool.z.so", - "path": "//foundation/ability/ability_base:extractortool", - "headers": [] - }, { "name": "ability_base:string_utils", "so_file_name": "libstring_utils.z.so", "path": "//foundation/ability/ability_base:string_utils", "headers": [] - }, - { - "name": "libjpeg-turbo:turbojpeg", - "so_file_name": "libturbojpeg.z.so", - "path": "//third_party/libjpeg-turbo:turbojpeg", - "headers": [] - }, - { - "name": "libsnd:sndfile", - "so_file_name": "libsndfile.z.so", - "path": "//third_party/libsnd:sndfile", - "headers": [] - }, - { - "name": "pcre2:libpcre2", - "so_file_name": "libsndfile.z.so", - "path": "//third_party/libsnd:sndfile", - "headers": [] - }, - { - "name": "pulseaudio:pulsecore", - "so_file_name": "libpulsecore.z.so", - "path": "//third_party/pulseaudio/ohosbuild/src/pulsecore:pulsecore", - "headers": [] - }, - { - "name": "pulseaudio:pulsecommon", - "so_file_name": "libpulsecommon.z.so", - "path": "//third_party/pulseaudio/ohosbuild/src:pulsecommon", - "headers": [] - }, - { - "name": "pulseaudio:speexresampler", - "so_file_name": "libspeexresampler.z.so", - "path": "//third_party/pulseaudio/speex:speexresampler", - "headers": [] - }, - { - "name": "selinux:libselinux", - "so_file_name": "libselinux.z.so", - "path": "//third_party/selinux:libselinux", - "headers": [] } -] +] \ No newline at end of file diff --git a/tools/deps_guard/rules/ChipsetSDK/chipsetsdk_info.json b/tools/deps_guard/rules/ChipsetSDK/chipsetsdk_info.json index f8692b6..4bf3c3f 100644 --- a/tools/deps_guard/rules/ChipsetSDK/chipsetsdk_info.json +++ b/tools/deps_guard/rules/ChipsetSDK/chipsetsdk_info.json @@ -167,12 +167,6 @@ "path": "//developtools/profiler/device/plugins/ffrt_profiler/client:libffrt_profiler", "headers": [] }, - { - "name": "thirdparty:libusb", - "so_file_name": "libusb_shared.z.so", - "path": "//third_party/libusb:libusb", - "headers": [] - }, { "name": "build:libclang_rt.ubsan_minimal.so", "so_file_name": "libclang_rt.ubsan_minimal.so", diff --git a/tools/deps_guard/rules/ChipsetsdkSP/chipsetsdk_sp_info.json b/tools/deps_guard/rules/ChipsetsdkSP/chipsetsdk_sp_info.json index 2b9dc37..0a03741 100755 --- a/tools/deps_guard/rules/ChipsetsdkSP/chipsetsdk_sp_info.json +++ b/tools/deps_guard/rules/ChipsetsdkSP/chipsetsdk_sp_info.json @@ -184,5 +184,11 @@ "so_file_name": "libffrt.so", "path": "//foundation/resourceschedule/ffrt:libffrt", "headers": [] + }, + { + "name": "thirdparty:libusb", + "so_file_name": "libusb_shared.z.so", + "path": "//third_party/libusb:libusb", + "headers": [] } ] \ No newline at end of file diff --git a/tools/deps_guard/rules/Passthrough/passthrough_indirect_info.json b/tools/deps_guard/rules/Passthrough/passthrough_indirect_info.json index 20df29e..bf6a176 100755 --- a/tools/deps_guard/rules/Passthrough/passthrough_indirect_info.json +++ b/tools/deps_guard/rules/Passthrough/passthrough_indirect_info.json @@ -53,12 +53,6 @@ "path": "//drivers/peripheral/usb/serial:libserial_interface_service_1.0", "headers": [] }, - { - "name": "hdf:libusb_host_interface_service_2.0", - "so_file_name": "libusb_host_interface_service_2.0.z.so", - "path": "//drivers/peripheral/usb/hdi_service:libusb_host_interface_service_2.0", - "headers": [] - }, { "name": "hdf:hdi_input", "so_file_name": "libhdi_input.z.so", diff --git a/tools/deps_guard/rules/Passthrough/passthrough_info.json b/tools/deps_guard/rules/Passthrough/passthrough_info.json index 04de8e0..9e08811 100755 --- a/tools/deps_guard/rules/Passthrough/passthrough_info.json +++ b/tools/deps_guard/rules/Passthrough/passthrough_info.json @@ -58,5 +58,11 @@ "so_file_name": "libdisplay_buffer_vdi_impl.z.so", "path": "//device/soc/rockchip/rk3568/hardware/display:libdisplay_buffer_vdi_impl", "headers": [] + }, + { + "name": "hdf:libusb_host_interface_service_2.0", + "so_file_name": "libusb_host_interface_service_2.0.z.so", + "path": "//drivers/peripheral/usb/hdi_service:libusb_host_interface_service_2.0", + "headers": [] } ] \ No newline at end of file diff --git a/tools/deps_guard/rules_checker/chipsetsdk.py b/tools/deps_guard/rules_checker/chipsetsdk.py index 19e6316..3d83e3e 100755 --- a/tools/deps_guard/rules_checker/chipsetsdk.py +++ b/tools/deps_guard/rules_checker/chipsetsdk.py @@ -84,6 +84,11 @@ class ChipsetSDKRule(BaseRule): self.log(f"****check_if_deps_correctly indirect result:{passed}****") if not passed: return passed + + passed = self.__check_if_tagged_correctly() + self.log(f"****check_tagged_correctly result:{passed}****") + if not passed: + return passed self.__write_innerkits_header_files() @@ -223,6 +228,25 @@ class ChipsetSDKRule(BaseRule): return passed + def __check_if_tagged_correctly(self): + passed = True + chipsetsdk_tagged_files = [mod["name"] for mod in self.__modules_with_chipsetsdk_tag] + chipsetsdk_indirect_tagged_files = [mod["name"] for mod in self.__modules_with_chipsetsdk_indirect_tag] + + for file_name in self.__chipsetsdks: + if file_name not in chipsetsdk_tagged_files: + passed = False + self.error('Chipset SDK module %s in chipsetsdk_info.json should add innerapi_tags with "chipsetsdk"' + % file_name) + + for file_name in self.__indirects: + if file_name not in chipsetsdk_indirect_tagged_files: + passed = False + self.error('chipsetsdk_indirect module %s in chipsetsdk_indirect_info.json should add innerapi_tags "chipsetsdk_indirect"' + % file_name) + + return passed + def __load_chipsetsdks(self): self.__chipsetsdks = self.load_chipsetsdk_json("chipsetsdk_info.json") diff --git a/tools/deps_guard/rules_checker/chipsetsdk_sp.py b/tools/deps_guard/rules_checker/chipsetsdk_sp.py index 301f191..9d07928 100644 --- a/tools/deps_guard/rules_checker/chipsetsdk_sp.py +++ b/tools/deps_guard/rules_checker/chipsetsdk_sp.py @@ -83,6 +83,11 @@ class ChipsetsdkSPRule(BaseRule): self.log(f"****check_if_deps_correctly indirect result:{passed}****") if not passed: return passed + + passed = self.__check_if_tagged_correctly() + self.log(f"****check_tagged_correctly result:{passed}****") + if not passed: + return passed return True @@ -148,6 +153,25 @@ class ChipsetsdkSPRule(BaseRule): return passed + def __check_if_tagged_correctly(self): + passed = True + chipsetsdk_sp_tagged_files = [mod["name"] for mod in self.__modules_with_chipsetsdk_sp_tag] + chipsetsdk_sp_indirect_tagged_files = [mod["name"] for mod in self.__modules_with_chipsetsdk_sp_indirect_tag] + + for file_name in self.__chipsetsdks: + if file_name not in chipsetsdk_sp_tagged_files: + passed = False + self.error('ChipsetSP SDK module %s in chipsetsdk_sp_info.json should add innerapi_tags with "chipsetsdk_sp"' + % file_name) + + for file_name in self.__indirects: + if file_name not in chipsetsdk_sp_indirect_tagged_files: + passed = False + self.error('chipsetsdk_sp_indirect module %s in chipsetsdk_sp_indirect_info.json should add innerapi_tags "chipsetsdk_sp_indirect"' + % file_name) + + return passed + def __load_chipsetsdk_sps(self): self.__chipsetsdks = self.load_chipsetsdk_json("chipsetsdk_sp_info.json") diff --git a/tools/deps_guard/rules_checker/passthrough.py b/tools/deps_guard/rules_checker/passthrough.py index 033bbed..4653c39 100644 --- a/tools/deps_guard/rules_checker/passthrough.py +++ b/tools/deps_guard/rules_checker/passthrough.py @@ -83,6 +83,11 @@ class PassthroughRule(BaseRule): self.log(f"****check_if_deps_correctly indirect result:{passed}****") if not passed: return passed + + passed = self.__check_if_tagged_correctly() + self.log(f"****check_tagged_correctly result:{passed}****") + if not passed: + return passed return True @@ -161,6 +166,26 @@ class PassthroughRule(BaseRule): return passed + def __check_if_tagged_correctly(self): + passed = True + passthrough_tagged_files = [mod["name"] for mod in self.__modules_with_passthrough_tag] + passthrough_indirect_tagged_files = [mod["name"] for mod in self.__modules_with_passthrough_indirect_tag] + + for file_name in self.__passthroughs: + if file_name not in passthrough_tagged_files: + passed = False + self.error('Passthrough module %s in passthrough_info.json should add innerapi_tags with "passthrough"' + % file_name) + + for file_name in self.__indirects: + if file_name not in passthrough_indirect_tagged_files: + passed = False + self.error('passthrough_indirect module %s in passthrough_indirect_info.json should add innerapi_tags "passthrough_indirect"' + % file_name) + + return passed + + def __load_passthroughs(self): self.__passthroughs = self.load_passthrough_json("passthrough_indirect_info.json") -- Gitee From 07df5b866f605de394685200dd662a29b9e37b71 Mon Sep 17 00:00:00 2001 From: liangxinyan123 Date: Thu, 11 Sep 2025 07:55:32 +0000 Subject: [PATCH 05/13] update tools/deps_guard/rules_checker/base_innerapi_rule.py. Signed-off-by: liangxinyan123 --- tools/deps_guard/rules_checker/base_innerapi_rule.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/deps_guard/rules_checker/base_innerapi_rule.py b/tools/deps_guard/rules_checker/base_innerapi_rule.py index 4e85adb..416a016 100644 --- a/tools/deps_guard/rules_checker/base_innerapi_rule.py +++ b/tools/deps_guard/rules_checker/base_innerapi_rule.py @@ -73,7 +73,7 @@ class BaseInnerapiRule(BaseRule): callee["name"] in white_lists: continue else: - self.error("NEED MODIFY: system only module %s depends on wrong module as %s in %s, dep module path is %s" + self.error("NEED MODIFY: vendor only module %s depends on wrong module as %s in %s, dep module path is %s" %(mod["name"], callee["name"], mod["labelPath"], callee["path"])) passed = False return passed \ No newline at end of file -- Gitee From 38c54b93f6256b75252d6cc6c4a70bd5c3e9a52b Mon Sep 17 00:00:00 2001 From: liangxinyan123 Date: Thu, 11 Sep 2025 08:03:32 +0000 Subject: [PATCH 06/13] update tools/deps_guard/rules/dep_whitelist.json. Signed-off-by: liangxinyan123 --- tools/deps_guard/rules/dep_whitelist.json | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/deps_guard/rules/dep_whitelist.json b/tools/deps_guard/rules/dep_whitelist.json index 0147c2c..3020815 100644 --- a/tools/deps_guard/rules/dep_whitelist.json +++ b/tools/deps_guard/rules/dep_whitelist.json @@ -312,20 +312,27 @@ "so_file_path": "all vendor lib so", "dep_file_name": "ld-musl-arm.so.1", "dep_file_path": "system/lib/ld-musl-arm.so.1", - "description": "all vendor lib so deps wrong lib libhilog.so with innerapi_tags [chipsetsdk]" + "description": "all vendor lib deps system only lib libhilog.so" + }, + { + "so_file_name": "all vendor lib so", + "so_file_path": "all vendor lib so", + "dep_file_name": "libutils.z.so", + "dep_file_path": "system/lib/chipset-sdk-sp/libutils.z.so", + "description": "all vendor lib deps wrong lib libhilog.so with innerapi_tags [chipsetsdk_sp]" }, { "so_file_name": "libusb_port_interface_service_2.0.z.so", "so_file_path": "vendor/lib/libusb_port_interface_service_2.0.z.so", "dep_file_name": "libusb_proxy_2.0.z.so", "dep_file_path": "system/lib/libusb_proxy_2.0.z.so", - "description": "vendor only lib vendor/lib/libusb_port_interface_service_2.0.z.so deps system lib system/lib/libusb_proxy_2.0.z.so" + "description": "vendor only lib vendor/lib/libusb_port_interface_service_2.0.z.so deps system only lib system/lib/libusb_proxy_2.0.z.so" }, { "so_file_name": "libusb_host_interface_service_2.0.z.so", "so_file_path": "vendor/lib/passthrough/indirect/libusb_host_interface_service_2.0.z.so", "dep_file_name": "libusb_proxy_2.0.z.so", "dep_file_path": "system/lib/libusb_proxy_2.0.z.so", - "description": "vendor only lib vendor/lib/passthrough/indirect/libusb_host_interface_service_2.0.z.so with innerapi_tags [passthrough_indirect] deps system lib system/lib/libusb_proxy_2.0.z.so" + "description": "vendor lib vendor/lib/passthrough/indirect/libusb_host_interface_service_2.0.z.so with innerapi_tags [passthrough_indirect] deps system lib system/lib/libusb_proxy_2.0.z.so" } ] \ No newline at end of file -- Gitee From d0b8bb5a800fd8248694866a552cd4ebba96f71c Mon Sep 17 00:00:00 2001 From: liangxinyan123 Date: Thu, 11 Sep 2025 08:09:01 +0000 Subject: [PATCH 07/13] update tools/deps_guard/rules_checker/chipsetsdk.py. Signed-off-by: liangxinyan123 --- tools/deps_guard/rules_checker/chipsetsdk.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/deps_guard/rules_checker/chipsetsdk.py b/tools/deps_guard/rules_checker/chipsetsdk.py index 3d83e3e..ce05962 100755 --- a/tools/deps_guard/rules_checker/chipsetsdk.py +++ b/tools/deps_guard/rules_checker/chipsetsdk.py @@ -234,13 +234,13 @@ class ChipsetSDKRule(BaseRule): chipsetsdk_indirect_tagged_files = [mod["name"] for mod in self.__modules_with_chipsetsdk_indirect_tag] for file_name in self.__chipsetsdks: - if file_name not in chipsetsdk_tagged_files: + if chipsetsdk_tagged_files and file_name not in chipsetsdk_tagged_files: passed = False self.error('Chipset SDK module %s in chipsetsdk_info.json should add innerapi_tags with "chipsetsdk"' % file_name) for file_name in self.__indirects: - if file_name not in chipsetsdk_indirect_tagged_files: + if chipsetsdk_indirect_tagged_files and file_name not in chipsetsdk_indirect_tagged_files: passed = False self.error('chipsetsdk_indirect module %s in chipsetsdk_indirect_info.json should add innerapi_tags "chipsetsdk_indirect"' % file_name) -- Gitee From 719a7bc56bb7ea6010241f96ceecaeb08b76381a Mon Sep 17 00:00:00 2001 From: liangxinyan123 Date: Thu, 11 Sep 2025 08:09:35 +0000 Subject: [PATCH 08/13] update tools/deps_guard/rules_checker/chipsetsdk_sp.py. Signed-off-by: liangxinyan123 --- tools/deps_guard/rules_checker/chipsetsdk_sp.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/deps_guard/rules_checker/chipsetsdk_sp.py b/tools/deps_guard/rules_checker/chipsetsdk_sp.py index 9d07928..c24d76f 100644 --- a/tools/deps_guard/rules_checker/chipsetsdk_sp.py +++ b/tools/deps_guard/rules_checker/chipsetsdk_sp.py @@ -159,13 +159,13 @@ class ChipsetsdkSPRule(BaseRule): chipsetsdk_sp_indirect_tagged_files = [mod["name"] for mod in self.__modules_with_chipsetsdk_sp_indirect_tag] for file_name in self.__chipsetsdks: - if file_name not in chipsetsdk_sp_tagged_files: + if chipsetsdk_sp_tagged_files and file_name not in chipsetsdk_sp_tagged_files: passed = False self.error('ChipsetSP SDK module %s in chipsetsdk_sp_info.json should add innerapi_tags with "chipsetsdk_sp"' % file_name) for file_name in self.__indirects: - if file_name not in chipsetsdk_sp_indirect_tagged_files: + if chipsetsdk_sp_indirect_tagged_files and file_name not in chipsetsdk_sp_indirect_tagged_files: passed = False self.error('chipsetsdk_sp_indirect module %s in chipsetsdk_sp_indirect_info.json should add innerapi_tags "chipsetsdk_sp_indirect"' % file_name) -- Gitee From 1b6f9a9bb469d9244015e6cfe09ac417f91ffe08 Mon Sep 17 00:00:00 2001 From: liangxinyan123 Date: Thu, 11 Sep 2025 08:10:16 +0000 Subject: [PATCH 09/13] update tools/deps_guard/rules_checker/passthrough.py. Signed-off-by: liangxinyan123 --- tools/deps_guard/rules_checker/passthrough.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/deps_guard/rules_checker/passthrough.py b/tools/deps_guard/rules_checker/passthrough.py index 4653c39..b55130b 100644 --- a/tools/deps_guard/rules_checker/passthrough.py +++ b/tools/deps_guard/rules_checker/passthrough.py @@ -172,23 +172,21 @@ class PassthroughRule(BaseRule): passthrough_indirect_tagged_files = [mod["name"] for mod in self.__modules_with_passthrough_indirect_tag] for file_name in self.__passthroughs: - if file_name not in passthrough_tagged_files: + if passthrough_tagged_files and file_name not in passthrough_tagged_files: passed = False self.error('Passthrough module %s in passthrough_info.json should add innerapi_tags with "passthrough"' % file_name) for file_name in self.__indirects: - if file_name not in passthrough_indirect_tagged_files: + if passthrough_indirect_tagged_files and file_name not in passthrough_indirect_tagged_files: passed = False self.error('passthrough_indirect module %s in passthrough_indirect_info.json should add innerapi_tags "passthrough_indirect"' % file_name) return passed - def __load_passthroughs(self): self.__passthroughs = self.load_passthrough_json("passthrough_indirect_info.json") - def __load_passthrough_indirects(self): self.__indirects = self.load_passthrough_json("passthrough_indirect_info.json") -- Gitee From 341a5fefdbe80058b425b963bc2ea9787341bf18 Mon Sep 17 00:00:00 2001 From: liangxinyan123 Date: Thu, 11 Sep 2025 09:00:57 +0000 Subject: [PATCH 10/13] update tools/deps_guard/rules_checker/chipsetsdk.py. Signed-off-by: liangxinyan123 --- tools/deps_guard/rules_checker/chipsetsdk.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/deps_guard/rules_checker/chipsetsdk.py b/tools/deps_guard/rules_checker/chipsetsdk.py index ce05962..61edd9f 100755 --- a/tools/deps_guard/rules_checker/chipsetsdk.py +++ b/tools/deps_guard/rules_checker/chipsetsdk.py @@ -233,6 +233,12 @@ class ChipsetSDKRule(BaseRule): chipsetsdk_tagged_files = [mod["name"] for mod in self.__modules_with_chipsetsdk_tag] chipsetsdk_indirect_tagged_files = [mod["name"] for mod in self.__modules_with_chipsetsdk_indirect_tag] + print(f"------chipsetsdk_indirect_tagged_files:{', '.join(chipsetsdk_indirect_tagged_files)}----------\n") + print(f"------self.__indirects:{', '.join(self.__indirects)}----------\n") + + print(f"------chipsetsdk_tagged_files:{', '.join(chipsetsdk_tagged_files)}----------\n") + print(f"------self.__chipsetsdks:{', '.join(self.__chipsetsdks)}----------\n") + for file_name in self.__chipsetsdks: if chipsetsdk_tagged_files and file_name not in chipsetsdk_tagged_files: passed = False -- Gitee From 4cc8d5e7ca287c688ca3a4c3495374f3faaa846d Mon Sep 17 00:00:00 2001 From: liangxinyan123 Date: Thu, 11 Sep 2025 11:45:53 +0000 Subject: [PATCH 11/13] update tools/deps_guard/rules_checker/passthrough.py. Signed-off-by: liangxinyan123 --- tools/deps_guard/rules_checker/passthrough.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/deps_guard/rules_checker/passthrough.py b/tools/deps_guard/rules_checker/passthrough.py index b55130b..fc214bc 100644 --- a/tools/deps_guard/rules_checker/passthrough.py +++ b/tools/deps_guard/rules_checker/passthrough.py @@ -171,14 +171,14 @@ class PassthroughRule(BaseRule): passthrough_tagged_files = [mod["name"] for mod in self.__modules_with_passthrough_tag] passthrough_indirect_tagged_files = [mod["name"] for mod in self.__modules_with_passthrough_indirect_tag] - for file_name in self.__passthroughs: - if passthrough_tagged_files and file_name not in passthrough_tagged_files: + for file_name in passthrough_tagged_files: + if file_name not in self.__passthroughs: passed = False self.error('Passthrough module %s in passthrough_info.json should add innerapi_tags with "passthrough"' % file_name) - for file_name in self.__indirects: - if passthrough_indirect_tagged_files and file_name not in passthrough_indirect_tagged_files: + for file_name in passthrough_indirect_tagged_files: + if file_name not in self.__indirects: passed = False self.error('passthrough_indirect module %s in passthrough_indirect_info.json should add innerapi_tags "passthrough_indirect"' % file_name) @@ -186,7 +186,8 @@ class PassthroughRule(BaseRule): return passed def __load_passthroughs(self): - self.__passthroughs = self.load_passthrough_json("passthrough_indirect_info.json") + self.__passthroughs = self.load_passthrough_json("passthrough_info.json") + def __load_passthrough_indirects(self): self.__indirects = self.load_passthrough_json("passthrough_indirect_info.json") -- Gitee From 10619e6a45642bdb3a0fbcfe83880173454e5793 Mon Sep 17 00:00:00 2001 From: liangxinyan123 Date: Thu, 11 Sep 2025 11:46:55 +0000 Subject: [PATCH 12/13] update tools/deps_guard/rules_checker/chipsetsdk_sp.py. Signed-off-by: liangxinyan123 --- tools/deps_guard/rules_checker/chipsetsdk_sp.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/deps_guard/rules_checker/chipsetsdk_sp.py b/tools/deps_guard/rules_checker/chipsetsdk_sp.py index c24d76f..97ae941 100644 --- a/tools/deps_guard/rules_checker/chipsetsdk_sp.py +++ b/tools/deps_guard/rules_checker/chipsetsdk_sp.py @@ -158,14 +158,14 @@ class ChipsetsdkSPRule(BaseRule): chipsetsdk_sp_tagged_files = [mod["name"] for mod in self.__modules_with_chipsetsdk_sp_tag] chipsetsdk_sp_indirect_tagged_files = [mod["name"] for mod in self.__modules_with_chipsetsdk_sp_indirect_tag] - for file_name in self.__chipsetsdks: - if chipsetsdk_sp_tagged_files and file_name not in chipsetsdk_sp_tagged_files: + for file_name in chipsetsdk_sp_tagged_files: + if file_name not in self.__chipsetsdks: passed = False self.error('ChipsetSP SDK module %s in chipsetsdk_sp_info.json should add innerapi_tags with "chipsetsdk_sp"' % file_name) - for file_name in self.__indirects: - if chipsetsdk_sp_indirect_tagged_files and file_name not in chipsetsdk_sp_indirect_tagged_files: + for file_name in chipsetsdk_sp_indirect_tagged_files: + if file_name not in self.__indirects: passed = False self.error('chipsetsdk_sp_indirect module %s in chipsetsdk_sp_indirect_info.json should add innerapi_tags "chipsetsdk_sp_indirect"' % file_name) -- Gitee From ba629423e987cc0d0b73fcbde3fae4dca9e3637c Mon Sep 17 00:00:00 2001 From: liangxinyan123 Date: Thu, 11 Sep 2025 11:48:43 +0000 Subject: [PATCH 13/13] update tools/deps_guard/rules_checker/chipsetsdk.py. Signed-off-by: liangxinyan123 --- .../passthrough_indirect_info.json | 6 +++++ tools/deps_guard/rules_checker/chipsetsdk.py | 22 +++++++------------ .../deps_guard/rules_checker/chipsetsdk_sp.py | 20 ++++++++--------- tools/deps_guard/rules_checker/passthrough.py | 16 +++++++------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/tools/deps_guard/rules/Passthrough/passthrough_indirect_info.json b/tools/deps_guard/rules/Passthrough/passthrough_indirect_info.json index bf6a176..3ccbb6e 100755 --- a/tools/deps_guard/rules/Passthrough/passthrough_indirect_info.json +++ b/tools/deps_guard/rules/Passthrough/passthrough_indirect_info.json @@ -70,5 +70,11 @@ "so_file_name": "libRkOMX_Resourcemanager.z.so", "path": "//device/soc/rockchip/rk3568/hardware/omx_il/component/common:libRkOMX_Resourcemanager", "headers": [] + }, + { + "name": "hdf:libusb_ddk_device", + "so_file_name": "libusb_ddk_device.z.so", + "path": "//drivers/peripheral/usb/ddk:libusb_ddk_device", + "headers": [] } ] \ No newline at end of file diff --git a/tools/deps_guard/rules_checker/chipsetsdk.py b/tools/deps_guard/rules_checker/chipsetsdk.py index 61edd9f..c743a37 100755 --- a/tools/deps_guard/rules_checker/chipsetsdk.py +++ b/tools/deps_guard/rules_checker/chipsetsdk.py @@ -230,26 +230,20 @@ class ChipsetSDKRule(BaseRule): def __check_if_tagged_correctly(self): passed = True - chipsetsdk_tagged_files = [mod["name"] for mod in self.__modules_with_chipsetsdk_tag] - chipsetsdk_indirect_tagged_files = [mod["name"] for mod in self.__modules_with_chipsetsdk_indirect_tag] + chipsetsdks = [mod for mod in self.__modules_with_chipsetsdk_tag if mod["name"] in self.__chipsetsdks] + indirects = [mod for mod in self.__modules_with_chipsetsdk_indirect_tag if mod["name"] in self.__indirects] - print(f"------chipsetsdk_indirect_tagged_files:{', '.join(chipsetsdk_indirect_tagged_files)}----------\n") - print(f"------self.__indirects:{', '.join(self.__indirects)}----------\n") - - print(f"------chipsetsdk_tagged_files:{', '.join(chipsetsdk_tagged_files)}----------\n") - print(f"------self.__chipsetsdks:{', '.join(self.__chipsetsdks)}----------\n") - - for file_name in self.__chipsetsdks: - if chipsetsdk_tagged_files and file_name not in chipsetsdk_tagged_files: + for mod in chipsetsdks: + if "chipsetsdk" not in mod["innerapi_tags"]: passed = False self.error('Chipset SDK module %s in chipsetsdk_info.json should add innerapi_tags with "chipsetsdk"' - % file_name) + % mod["name"]) - for file_name in self.__indirects: - if chipsetsdk_indirect_tagged_files and file_name not in chipsetsdk_indirect_tagged_files: + for mod in indirects: + if "chipsetsdk_indirect" not in mod["innerapi_tags"]: passed = False self.error('chipsetsdk_indirect module %s in chipsetsdk_indirect_info.json should add innerapi_tags "chipsetsdk_indirect"' - % file_name) + % mod["name"]) return passed diff --git a/tools/deps_guard/rules_checker/chipsetsdk_sp.py b/tools/deps_guard/rules_checker/chipsetsdk_sp.py index 97ae941..d78abe4 100644 --- a/tools/deps_guard/rules_checker/chipsetsdk_sp.py +++ b/tools/deps_guard/rules_checker/chipsetsdk_sp.py @@ -144,7 +144,7 @@ class ChipsetsdkSPRule(BaseRule): # check if all path in chipset-sdk-sp so contains sp/indirect innerapi_tags if "chipset-sdk-sp" in mod["path"]: - if mod["name"] not in self.__chipsetsdks and mod["name"] not in self.__indirects: + if mod["name"] not in self.__chipsetsdk_sps and mod["name"] not in self.__indirects: # Not allowed passed = False self.error("NEED MODIFY: so file %s in %s should be add in file chipsetsdk_sp_info.json or chipsetsdk_sp_indirect_info.json" @@ -155,25 +155,25 @@ class ChipsetsdkSPRule(BaseRule): def __check_if_tagged_correctly(self): passed = True - chipsetsdk_sp_tagged_files = [mod["name"] for mod in self.__modules_with_chipsetsdk_sp_tag] - chipsetsdk_sp_indirect_tagged_files = [mod["name"] for mod in self.__modules_with_chipsetsdk_sp_indirect_tag] + chipsetsdk_sps = [mod for mod in self.__modules_with_chipsetsdk_sp_tag if mod["name"] in self.__chipsetsdk_sps] + sp_indirects = [mod for mod in self.__modules_with_chipsetsdk_sp_indirect_tag if mod["name"] in self.__indirects] - for file_name in chipsetsdk_sp_tagged_files: - if file_name not in self.__chipsetsdks: + for mod in chipsetsdk_sps: + if "chipsetsdk_sp" not in mod["innerapi_tags"]: passed = False self.error('ChipsetSP SDK module %s in chipsetsdk_sp_info.json should add innerapi_tags with "chipsetsdk_sp"' - % file_name) + % mod["name"]) - for file_name in chipsetsdk_sp_indirect_tagged_files: - if file_name not in self.__indirects: + for mod in sp_indirects: + if "chipsetsdk_sp_indirect" not in mod["innerapi_tags"]: passed = False self.error('chipsetsdk_sp_indirect module %s in chipsetsdk_sp_indirect_info.json should add innerapi_tags "chipsetsdk_sp_indirect"' - % file_name) + % mod["name"]) return passed def __load_chipsetsdk_sps(self): - self.__chipsetsdks = self.load_chipsetsdk_json("chipsetsdk_sp_info.json") + self.__chipsetsdk_sps = self.load_chipsetsdk_json("chipsetsdk_sp_info.json") def __load_chipsetsdk_sp_indirects(self): self.__indirects = self.load_chipsetsdk_json("chipsetsdk_sp_indirect_info.json") diff --git a/tools/deps_guard/rules_checker/passthrough.py b/tools/deps_guard/rules_checker/passthrough.py index fc214bc..9ae8a08 100644 --- a/tools/deps_guard/rules_checker/passthrough.py +++ b/tools/deps_guard/rules_checker/passthrough.py @@ -168,20 +168,20 @@ class PassthroughRule(BaseRule): def __check_if_tagged_correctly(self): passed = True - passthrough_tagged_files = [mod["name"] for mod in self.__modules_with_passthrough_tag] - passthrough_indirect_tagged_files = [mod["name"] for mod in self.__modules_with_passthrough_indirect_tag] + passthroughs = [mod for mod in self.__modules_with_passthrough_tag if mod["name"] in self.__passthroughs] + indirects = [mod for mod in self.__modules_with_passthrough_indirect_tag if mod["name"] in self.__indirects] - for file_name in passthrough_tagged_files: - if file_name not in self.__passthroughs: + for mod in passthroughs: + if "passthrough" not in mod["innerapi_tags"]: passed = False self.error('Passthrough module %s in passthrough_info.json should add innerapi_tags with "passthrough"' - % file_name) + % mod["name"]) - for file_name in passthrough_indirect_tagged_files: - if file_name not in self.__indirects: + for mod in indirects: + if "passthrough_indirect" not in mod["innerapi_tags"]: passed = False self.error('passthrough_indirect module %s in passthrough_indirect_info.json should add innerapi_tags "passthrough_indirect"' - % file_name) + % mod["name"]) return passed -- Gitee