!38 usbmaneger patch

Merge pull request !38 from 包泽伟/master

BUILD.gn

@@ -126,7 +126,10 @@ cupsfilter_generated_sources = [ "$scheduler_code_dir/cupsfilter.c" ]
 
 ipp_generated_sources = [ "$backend_code_dir/ipp.c" ]
 
-usb_generated_sources = [ "$backend_code_dir/usb.c" ]
+usb_generated_sources = [
+  "$backend_code_dir/usb.c",
+  "$backend_code_dir/usb_manager.cxx",
+]
 
 lp_generated_sources = [ "$cups_code_dir/systemv/lp.c" ]
 
@@ -331,6 +334,12 @@ ohos_executable("usb") {
     "//third_party/cups:cups",
     "//third_party/libusb:libusb",
   ]
+  external_deps = [
+    "c_utils:utils",
+    "drivers_interface_usb:libusb_proxy_1.0",
+    "hilog:libhilog",
+    "usb_manager:usbsrv_client",
+  ]
   install_enable = true
   module_install_dir = "$cups_serverbin_dir/backend"
   public_configs = [ ":cups_config" ]

bundle.json

@@ -21,7 +21,12 @@
         "rom": "",
         "ram": "",
         "deps": {
-            "components": [],
+            "components": [
+                "c_utils",
+                "drivers_interface_usb",
+                "hilog",
+                "usb_manager"
+            ],
             "third_party": [
                 "zlib",
                 "openssl",

install.py

@@ -48,6 +48,7 @@ def move_file(src_path, dst_path):
         "ohos-add-openssl.patch",
         "backport-CVE-2023-4504.patch",
         "backport-CVE-2024-35235.patch",
+        "ohos-usb-manager.patch",
         "config.h"
     ]
     for file in files:
@@ -77,7 +78,8 @@ def do_patch(target_dir):
         "ohos-add-openssl.patch",
         "backport-CVE-2023-4504.patch",
         "backport-CVE-2024-35235.patch",
-        "ohos_ip_conflict.patch"
+        "ohos_ip_conflict.patch",
+        "ohos-usb-manager.patch"
     ]
 
     for patch in patch_file: