From 676998aeead71a47bbccf8e24ae1546bccda286d Mon Sep 17 00:00:00 2001 From: xwx1135370 Date: Sat, 14 Jun 2025 20:21:41 +0800 Subject: [PATCH] =?UTF-8?q?[Bug]:=E7=8B=AC=E7=AB=8B=E7=BC=96=E8=AF=91c=5Fu?= =?UTF-8?q?tils=E4=BE=9D=E8=B5=96rust=E5=AE=9A=E5=88=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit issue:https://gitee.com/openharmony/commonlibrary_c_utils/issues/ICF7IF?from=project-issue Signed-off-by: xwx1135370 --- base/BUILD.gn | 18 ++++++++++++++++-- base/test/unittest/rust/BUILD.gn | 16 ++++++++++++++-- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/base/BUILD.gn b/base/BUILD.gn index dd4aa59..5cd94cd 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -277,7 +277,14 @@ if (host_os == "linux" && host_cpu != "arm64" && !is_arkui_x && current_os != "m "${target_gen_dir}", ] deps = [ ":cxx_rust_gen" ] - external_deps = [ "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" ] + } + public_external_deps = [ "bounds_checking_function:libsec_shared" ] subsystem_name = "commonlibrary" part_name = "c_utils" @@ -294,7 +301,14 @@ if (!is_arkui_x && !(host_os == "linux" && host_cpu == "arm64") && current_os != "src/rust/lib.rs", ] deps = [ ":utils_static_cxx_rust" ] - external_deps = [ "rust_cxx:lib" ] + + 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_root = "src/rust/lib.rs" crate_name = "utils_rust" crate_type = "dylib" diff --git a/base/test/unittest/rust/BUILD.gn b/base/test/unittest/rust/BUILD.gn index fed3c97..eccc3e5 100644 --- a/base/test/unittest/rust/BUILD.gn +++ b/base/test/unittest/rust/BUILD.gn @@ -44,13 +44,25 @@ if (host_os == "linux" && !is_asan && !is_arkui_x) { module_out_path = "c_utils/rust" sources = [ "rust_utils_file_test.rs" ] deps = [ "//commonlibrary/c_utils/base:utils_rust" ] - external_deps = [ "rust_cxx:lib" ] + + 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" ] + } } ohos_rust_unittest("rust_utils_directory_test") { module_out_path = "c_utils/rust" sources = [ "rust_utils_directory_test.rs" ] deps = [ "//commonlibrary/c_utils/base:utils_rust" ] - external_deps = [ "rust_cxx:lib" ] + + 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" ] + } } } -- Gitee