From 368465f45315a375ea0746c755f9443db671d458 Mon Sep 17 00:00:00 2001 From: Luming Date: Mon, 23 Jun 2025 13:27:25 +0800 Subject: [PATCH] =?UTF-8?q?rust=E7=9B=B8=E5=85=B3=E9=83=A8=E4=BB=B6?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E7=99=BD=E5=90=8D=E5=8D=95=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Luming --- interfaces/innerkits/rust/BUILD.gn | 16 ++-------------- interfaces/innerkits/rust/tests/BUILD.gn | 18 ++++++++---------- 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/interfaces/innerkits/rust/BUILD.gn b/interfaces/innerkits/rust/BUILD.gn index 7c0c83f5..e847b7e1 100644 --- a/interfaces/innerkits/rust/BUILD.gn +++ b/interfaces/innerkits/rust/BUILD.gn @@ -45,15 +45,9 @@ ohos_static_library("samgr_rust_cpp") { "c_utils:utils", "hilog:libhilog", "ipc:ipc_single", + "rust_cxx:cxx_cppdeps", ] - if (defined(global_parts_info) && - !defined(global_parts_info.third_party_rust_cxx)) { - deps += [ "//third_party/rust/crates/cxx:cxx_cppdeps" ] - } else { - external_deps += [ "rust_cxx:cxx_cppdeps" ] - } - subsystem_name = "systemabilitymgr" part_name = "samgr" } @@ -66,17 +60,11 @@ ohos_rust_shared_library("samgr_rust") { external_deps = [ "hilog:hilog_rust", "ipc:ipc_rust", + "rust_cxx:lib", ] deps = [ ":samgr_rust_cpp" ] - if (defined(global_parts_info) && - !defined(global_parts_info.third_party_rust_cxx)) { - deps += [ "//third_party/rust/crates/cxx:lib" ] - } else { - external_deps += [ "rust_cxx:lib" ] - } - crate_name = "samgr" install_images = [ system_base_dir ] diff --git a/interfaces/innerkits/rust/tests/BUILD.gn b/interfaces/innerkits/rust/tests/BUILD.gn index bfff3bd4..8746daed 100644 --- a/interfaces/innerkits/rust/tests/BUILD.gn +++ b/interfaces/innerkits/rust/tests/BUILD.gn @@ -28,12 +28,12 @@ ohos_static_library("samgr_rust_test_c") { "${target_gen_dir}/src", ] - deps = [ - ":samgr_rust_test_gen", - "//third_party/rust/crates/cxx:cxx_cppdeps", - ] + deps = [ ":samgr_rust_test_gen" ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "rust_cxx:cxx_cppdeps", + ] subsystem_name = "systemabilitymgr" part_name = "samgr" @@ -46,12 +46,10 @@ ohos_rust_unittest("rust_samgr_ut_test") { external_deps = [ "hilog:hilog_rust", "ipc:ipc_rust", + "rust_cxx:lib", ] - deps = [ - "../../rust:samgr_rust_cpp", - "//third_party/rust/crates/cxx:lib", - ] + deps = [ "../../rust:samgr_rust_cpp" ] subsystem_name = "systemabilitymgr" part_name = "samgr" @@ -67,12 +65,12 @@ ohos_rust_systemtest("rust_samgr_sdv_test") { deps = [ ":samgr_rust_test_c", "../../rust:samgr_rust", - "//third_party/rust/crates/cxx:lib", ] external_deps = [ "hilog:hilog_rust", "ipc:ipc_rust", "safwk:system_ability_fwk_rust", + "rust_cxx:lib" ] defines = [] if (samgr_support_access_token) { -- Gitee