From 6838a4ed65e97cdb783fd2a6c0b3213af3368fcc Mon Sep 17 00:00:00 2001 From: chenkeyu Date: Tue, 3 Jun 2025 14:48:30 +0800 Subject: [PATCH] independent build fix Signed-off-by: chenkeyu --- base/BUILD.gn | 12 ++++-------- base/test/unittest/rust/BUILD.gn | 12 ++++-------- bundle.json | 3 +-- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/base/BUILD.gn b/base/BUILD.gn index e4ca743..c867e31 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -276,10 +276,8 @@ if (host_os == "linux" && host_cpu != "arm64" && !is_arkui_x && current_os != "m "include", "${target_gen_dir}", ] - deps = [ - ":cxx_rust_gen", - "//third_party/rust/crates/cxx:cxx_cppdeps", - ] + deps = [ ":cxx_rust_gen" ] + external_deps = [ "rust_cxx:cxx_cppdeps" ] public_external_deps = [ "bounds_checking_function:libsec_shared" ] subsystem_name = "commonlibrary" part_name = "c_utils" @@ -295,10 +293,8 @@ if (!is_arkui_x && !(host_os == "linux" && host_cpu == "arm64") && current_os != "src/rust/file_ex.rs", "src/rust/lib.rs", ] - deps = [ - ":utils_static_cxx_rust", - "//third_party/rust/crates/cxx:lib", - ] + deps = [ ":utils_static_cxx_rust" ] + 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 e231a0b..fed3c97 100644 --- a/base/test/unittest/rust/BUILD.gn +++ b/base/test/unittest/rust/BUILD.gn @@ -43,18 +43,14 @@ if (host_os == "linux" && !is_asan && !is_arkui_x) { ohos_rust_unittest("rust_utils_file_test") { module_out_path = "c_utils/rust" sources = [ "rust_utils_file_test.rs" ] - deps = [ - "//commonlibrary/c_utils/base:utils_rust", - "//third_party/rust/crates/cxx:lib", - ] + deps = [ "//commonlibrary/c_utils/base:utils_rust" ] + 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", - "//third_party/rust/crates/cxx:lib", - ] + deps = [ "//commonlibrary/c_utils/base:utils_rust" ] + external_deps = [ "rust_cxx:lib" ] } } diff --git a/bundle.json b/bundle.json index 3042fa4..79b5632 100644 --- a/bundle.json +++ b/bundle.json @@ -30,8 +30,7 @@ "deps": { "components": [ "hilog", - "googletest", - "benchmark" + "rust_cxx" ], "third_party": [ "bounds_checking_function" -- Gitee