diff --git a/tools/deps_guard/rules/ChipsetsdkSP/chipsetsdk_sp_info.json b/tools/deps_guard/rules/ChipsetsdkSP/chipsetsdk_sp_info.json index f1d1a8f6..556ab2c0 100755 --- a/tools/deps_guard/rules/ChipsetsdkSP/chipsetsdk_sp_info.json +++ b/tools/deps_guard/rules/ChipsetsdkSP/chipsetsdk_sp_info.json @@ -244,5 +244,11 @@ "so_file_name": "libclang_rt.ubsan_minimal.so", "path": "//build/common/ubsan:libclang_rt.ubsan_minimal.so", "headers": [] - } + }, + { + "name": "hdf:libusb_proxy_2.0.z.so", + "so_file_name": "libusb_proxy_2.0.z.so", + "path": "//drivers/interface/usb/v2_0:libusb_proxy_2.0.z.so", + "headers": [] + } ] \ No newline at end of file diff --git a/tools/deps_guard/rules/Passthrough/passthrough_indirect.json b/tools/deps_guard/rules/Passthrough/passthrough_indirect.json index e002cf88..3ccbb6ec 100755 --- a/tools/deps_guard/rules/Passthrough/passthrough_indirect.json +++ b/tools/deps_guard/rules/Passthrough/passthrough_indirect.json @@ -76,17 +76,5 @@ "so_file_name": "libusb_ddk_device.z.so", "path": "//drivers/peripheral/usb/ddk:libusb_ddk_device", "headers": [] - }, - { - "name": "hdf:libusb_ddk_host", - "so_file_name": "libusb_ddk_host.z.so", - "path": "//drivers/peripheral/usb/ddk:libusb_ddk_host", - "headers": [] - }, - { - "name": "hdf:libusbfn_mtp_interface_service_1.0", - "so_file_name": "libusbfn_mtp_interface_service_1.0.z.so", - "path": "//drivers/peripheral/usb/ddk:libusbfn_mtp_interface_service_1.0", - "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 538cf0b4..4d69a1d5 100755 --- a/tools/deps_guard/rules/Passthrough/passthrough_info.json +++ b/tools/deps_guard/rules/Passthrough/passthrough_info.json @@ -65,6 +65,12 @@ "path": "//drivers/peripheral/usb/hdi_service:libusb_host_interface_service_2.0", "headers": [] }, + { + "name": "hdf:libusbfn_mtp_interface_service_1.0", + "so_file_name": "libusbfn_mtp_interface_service_1.0.z.so", + "path": "//drivers/peripheral/usb/ddk:libusbfn_mtp_interface_service_1.0", + "headers": [] + }, { "name": "hdf:libcamera_vendor_tag_service_1.0", "so_file_name": "libcamera_vendor_tag_service_1.0.z.so", diff --git a/tools/deps_guard/rules/chipsetsdk_dep_whitelist.json b/tools/deps_guard/rules/chipsetsdk_dep_whitelist.json index b33e75ad..3932dbb2 100644 --- a/tools/deps_guard/rules/chipsetsdk_dep_whitelist.json +++ b/tools/deps_guard/rules/chipsetsdk_dep_whitelist.json @@ -10422,18 +10422,25 @@ "description": "vendor only lib libaudio_stub_6.0.z.so deps wrong lib libclang_rt.asan.so in system/lib/libclang_rt.asan.so" }, { - "so_file_name": "libusb_ddk_host.z.so", - "so_file_path": "vendor/lib/passthrough/indirect/libusb_ddk_host.z.so", + "so_file_name": "libusbfn_mtp_interface_service_1.0.z.so", + "so_file_path": "vendor/lib/passthrough/libusbfn_mtp_interface_service_1.0.z.so", "dep_file_name": "libhilog.so", "dep_file_path": "system/lib/chipset-sdk/libhilog.so", - "description": "lib libusb_ddk_host.z.so with innerapi_tags [passthrough_indirect] deps wrong lib libhilog.so contains innerapi_tags [chipsetsdk]" + "description": "lib libusbfn_mtp_interface_service_1.0.z.so with innerapi_tags [passthrough] deps wrong lib libhilog.so contains innerapi_tags [chipsetsdk]" }, { - "so_file_name": "libusbfn_mtp_interface_service_1.0.z.so", - "so_file_path": "vendor/lib/passthrough/indirect/libusbfn_mtp_interface_service_1.0.z.so", + "so_file_name": "libusb_proxy_2.0.z.so", + "so_file_path": "system/lib/chipset-sdk-sp/libusb_proxy_2.0.z.so", "dep_file_name": "libhilog.so", "dep_file_path": "system/lib/chipset-sdk/libhilog.so", - "description": "lib libusbfn_mtp_interface_service_1.0.z.so with innerapi_tags [passthrough_indirect] deps wrong lib libhilog.so contains innerapi_tags [chipsetsdk]" + "description": "lib libusb_proxy_2.0.z.so with innerapi_tags [chipsetsdk_sp] deps wrong lib libhilog.so contains innerapi_tags [chipsetsdk]" + }, + { + "so_file_name": "libusb_proxy_2.0.z.so", + "so_file_path": "system/lib/chipset-sdk-sp/libusb_proxy_2.0.z.so", + "dep_file_name": "ld-musl-arm.so.1", + "dep_file_path": "system/lib/ld-musl-arm.so.1", + "description": "lib libusb_proxy_2.0.z.so with innerapi_tags [chipsetsdk_sp] cannot depend system only file ld-musl-arm.so.1 with //build/common/musl:ld-musl-arm.so.1" }, { "so_file_name": "libsensor_convert_proxy_1.0.z.so",