diff --git a/usb/BUILD.gn b/usb/BUILD.gn index 02c4822a95a0583d18d49e3aff4e109f93a312f7..efe0d381aee6b4a3a0a89c79dfd4458b3af7982d 100644 --- a/usb/BUILD.gn +++ b/usb/BUILD.gn @@ -18,15 +18,12 @@ if (defined(ohos_lite)) { } else { import("//build/config/components/hdi/hdi.gni") import("//build/ohos.gni") + import("./usb.gni") group("usb_entry") { deps = [ "./cfg:usb_etc_files", "./ddk:libusb_core", - "./ddk_service/common:libusb_ddk_service_common", - "./ddk_service/scsi_service:scsi_ddk_target", - "./ddk_service/serial_service:usb_serial_ddk_target", - "./ddk_service/usb_service:usb_ddk_target", "./gadget/function/acm:libusbfn_cdcacm", "./gadget/function/ecm:libusbfn_cdcecm", "./gadget/function/mtp:hdi_usbfn_mtp_service", @@ -36,5 +33,14 @@ if (defined(ohos_lite)) { "./net:libusbhost_rndis_rawapi", "./serial:usbhost_acm", ] + + if (drivers_peripheral_usb_feature_ddk_service) { + deps += [ + "./ddk_service/common:libusb_ddk_service_common", + "./ddk_service/scsi_service:scsi_ddk_target", + "./ddk_service/serial_service:usb_serial_ddk_target", + "./ddk_service/usb_service:usb_ddk_target", + ] + } } } diff --git a/usb/bundle.json b/usb/bundle.json index 6e95134bbcc602077811a90281e0fb1b514dddc8..ea3382028bcad5ee2dfe92d08cc177bc5d792e4c 100644 --- a/usb/bundle.json +++ b/usb/bundle.json @@ -14,6 +14,7 @@ "subsystem": "hdf", "features": [ "drivers_peripheral_usb_feature_linux_native_model", + "drivers_peripheral_usb_feature_ddk_service", "drivers_peripheral_usb_feature_emulator_mode" ], "hisysevent_config": [ diff --git a/usb/hdi_service/BUILD.gn b/usb/hdi_service/BUILD.gn index 1b4ab2771ae99809032b6e6514f90d673ebddaee..8fb05026f851ac8727f900af509dc601f65dde8b 100644 --- a/usb/hdi_service/BUILD.gn +++ b/usb/hdi_service/BUILD.gn @@ -192,7 +192,6 @@ ohos_shared_library("libusb_port_interface_service_2.0") { sources = [ "src/usb_port_impl.cpp", "src/usb_report_sys_event.cpp", - "src/usbd_load_usb_service.cpp", "src/usbd_port.cpp", "src/usbd_ports.cpp", ] @@ -320,8 +319,6 @@ ohos_shared_library("libusb_host_interface_service_2.0") { "src/usb_transfer_callback.cpp", "src/usbd_function.cpp", "src/usbd_load_usb_service.cpp", - "src/usbd_port.cpp", - "src/usbd_ports.cpp", ] configs = [ ":usbd_private_config" ] diff --git a/usb/usb.gni b/usb/usb.gni index 7be0a010a3c654fddd76f3e1735c896e6694cb28..1bd65fe46c8a761fda2e0c7a02c6c4cc9bd2186b 100644 --- a/usb/usb.gni +++ b/usb/usb.gni @@ -17,6 +17,7 @@ usb_driver_part_name = "usb_driver" declare_args() { drivers_peripheral_usb_feature_linux_native_model = false drivers_peripheral_usb_feature_emulator_mode = false + drivers_peripheral_usb_feature_ddk_service = true usb_hisysevent_enable = true usb_samgr_enable = true