From a6258f2e5474c04d374db54119313e42ae83ccb1 Mon Sep 17 00:00:00 2001
From: xqq879988 <xieqiqi2@huawei.com>
Date: Thu, 29 May 2025 16:12:25 +0800
Subject: [PATCH] =?UTF-8?q?samgr=E6=94=AF=E6=8C=81=E7=8B=AC=E7=AB=8B?=
 =?UTF-8?q?=E7=BC=96=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: xqq879988 <xieqiqi2@huawei.com>
---
 bundle.json                                  | 6 +++++-
 interfaces/innerkits/rust/BUILD.gn           | 9 ++++-----
 services/common/test/unittest/BUILD.gn       | 2 +-
 services/samgr/native/test/unittest/BUILD.gn | 4 ++++
 test/fuzztest/samgrcoverage_fuzzer/BUILD.gn  | 1 +
 test/fuzztest/samgrdumper_fuzzer/BUILD.gn    | 1 +
 6 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/bundle.json b/bundle.json
index c2baa2b9..a4247bd8 100644
--- a/bundle.json
+++ b/bundle.json
@@ -35,6 +35,8 @@
                 "c_utils",
                 "common_event_service",
                 "device_manager",
+                "dsoftbus",
+                "eventhandler",
                 "ffrt",
                 "hicollie",
                 "hilog",
@@ -45,9 +47,11 @@
                 "json",
                 "libxml2",
                 "preferences",
+                "rust_cxx",
                 "safwk",
                 "selinux_adapter",
-                "config_policy"
+                "config_policy",
+                "ylong_runtime"
             ]
         },
         "build": {
diff --git a/interfaces/innerkits/rust/BUILD.gn b/interfaces/innerkits/rust/BUILD.gn
index 9e79f1d3..2d031096 100644
--- a/interfaces/innerkits/rust/BUILD.gn
+++ b/interfaces/innerkits/rust/BUILD.gn
@@ -39,13 +39,13 @@ ohos_static_library("samgr_rust_cpp") {
   deps = [
     ":samgr_cxx_gen",
     "../samgr_proxy:samgr_proxy",
-    "//third_party/rust/crates/cxx:cxx_cppdeps",
   ]
 
   external_deps = [
     "c_utils:utils",
     "hilog:libhilog",
     "ipc:ipc_single",
+    "rust_cxx:cxx_cppdeps",
   ]
 
   subsystem_name = "systemabilitymgr"
@@ -60,12 +60,11 @@ ohos_rust_shared_library("samgr_rust") {
   external_deps = [
     "hilog:hilog_rust",
     "ipc:ipc_rust",
+    "rust_cxx:lib",
   ]
 
-  deps = [
-    ":samgr_rust_cpp",
-    "//third_party/rust/crates/cxx:lib",
-  ]
+  deps = [ ":samgr_rust_cpp" ]
+
   crate_name = "samgr"
 
   install_images = [ system_base_dir ]
diff --git a/services/common/test/unittest/BUILD.gn b/services/common/test/unittest/BUILD.gn
index ff5b048a..d73b7b27 100644
--- a/services/common/test/unittest/BUILD.gn
+++ b/services/common/test/unittest/BUILD.gn
@@ -36,7 +36,6 @@ ohos_unittest("ParseUtilTest") {
   deps = [
     "//foundation/systemabilitymgr/samgr/interfaces/innerkits/common:samgr_common",
     "//foundation/systemabilitymgr/samgr/services/common/test/mock:mock_sa",
-    "//third_party/googletest:gtest_main",
   ]
 
   cflags = []
@@ -46,6 +45,7 @@ ohos_unittest("ParseUtilTest") {
 
   external_deps = [
     "c_utils:utils",
+    "googletest:gtest_main",
     "json:nlohmann_json_static",
   ]
 }
diff --git a/services/samgr/native/test/unittest/BUILD.gn b/services/samgr/native/test/unittest/BUILD.gn
index 9182f21b..d938acd6 100644
--- a/services/samgr/native/test/unittest/BUILD.gn
+++ b/services/samgr/native/test/unittest/BUILD.gn
@@ -363,6 +363,7 @@ ohos_unittest("SystemAbilityMgrDeviceNetworkingTest") {
     "hitrace:hitrace_meter",
     "init:libbeget_proxy",
     "init:libbegetutil",
+    "ipc:ipc_core",
     "ipc:ipc_single",
     "ipc:libdbinder",
     "json:nlohmann_json_static",
@@ -667,6 +668,7 @@ ohos_unittest("SystemAbilityStateSchedulerTest") {
     "hitrace:hitrace_meter",
     "init:libbeget_proxy",
     "init:libbegetutil",
+    "ipc:ipc_core",
     "ipc:ipc_single",
     "ipc:libdbinder",
     "json:nlohmann_json_static",
@@ -746,6 +748,7 @@ ohos_unittest("SystemAbilityMgrDumperTest") {
     "hitrace:hitrace_meter",
     "init:libbeget_proxy",
     "init:libbegetutil",
+    "ipc:ipc_core",
     "ipc:ipc_single",
     "ipc:libdbinder",
     "json:nlohmann_json_static",
@@ -801,6 +804,7 @@ ohos_unittest("MockSystemAbilityManagerTest") {
     "hitrace:hitrace_meter",
     "init:libbeget_proxy",
     "init:libbegetutil",
+    "ipc:ipc_core",
     "ipc:ipc_single",
     "ipc:libdbinder",
     "json:nlohmann_json_static",
diff --git a/test/fuzztest/samgrcoverage_fuzzer/BUILD.gn b/test/fuzztest/samgrcoverage_fuzzer/BUILD.gn
index 5e03c404..a3ba86f0 100644
--- a/test/fuzztest/samgrcoverage_fuzzer/BUILD.gn
+++ b/test/fuzztest/samgrcoverage_fuzzer/BUILD.gn
@@ -84,6 +84,7 @@ ohos_fuzztest("SamgrCoverageFuzzTest") {
     "hitrace:hitrace_meter",
     "init:libbeget_proxy",
     "init:libbegetutil",
+    "ipc:ipc_core",
     "ipc:ipc_single",
     "ipc:libdbinder",
     "json:nlohmann_json_static",
diff --git a/test/fuzztest/samgrdumper_fuzzer/BUILD.gn b/test/fuzztest/samgrdumper_fuzzer/BUILD.gn
index d8ff0e5d..a4c4ec73 100644
--- a/test/fuzztest/samgrdumper_fuzzer/BUILD.gn
+++ b/test/fuzztest/samgrdumper_fuzzer/BUILD.gn
@@ -83,6 +83,7 @@ ohos_fuzztest("SamgrDumperFuzzTest") {
     "hitrace:hitrace_meter",
     "init:libbeget_proxy",
     "init:libbegetutil",
+    "ipc:ipc_core",
     "ipc:ipc_single",
     "ipc:libdbinder",
     "json:nlohmann_json_static",
-- 
Gitee