diff --git a/bundle.json b/bundle.json index c2baa2b99f9308bdc374971e3e84f121bd7bb6fd..a4247bd8cf17d1612e8dc0d826f19aece23b958d 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 9e79f1d3e710abd223681d6182079eb296d862b2..2d0310965e0c8307a3b896e9e8061aae47b4a162 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 ff5b048a8d7499434f8a8db16540be46f5766396..d73b7b27cae9749bd4208947cd222b816567639c 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 9182f21b99b5dca2ce30f4391600092bad12e9e6..d938acd617d0d7f646564c2b1799c4d6ec06e6c6 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 5e03c4048048b2d596037522f5cc660c45df3ed5..a3ba86f0bfa05e666da878c313a05ae1ecfcf0d9 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 d8ff0e5d3414e5adee412e55f98100e086331e4b..a4c4ec731f7f57e2f25bb00f0e36dd674a8123c1 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",