From 60c85e7061ba01f078b33be4e01016d38c7d0947 Mon Sep 17 00:00:00 2001 From: Luming Date: Mon, 23 Jun 2025 13:27:15 +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 --- base/BUILD.gn | 21 ++++++--------------- base/test/unittest/rust/BUILD.gn | 15 ++------------- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/base/BUILD.gn b/base/BUILD.gn index 5cd94cd..a5a4dc5 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -32,10 +32,10 @@ config("utils_config") { defines += [ "IOS_PLATFORM" ] } if (current_os == "win" || current_os == "mingw") { - defines += [ "WINDOWS_PLATFORM" ] + defines += [ "WINDOWS_PLATFORM" ] } if (current_os == "mac") { - defines += [ "MAC_PLATFORM" ] + defines += [ "MAC_PLATFORM" ] } if (is_emulator == true) { defines += [ "EMULATOR_PLATFORM" ] @@ -253,7 +253,8 @@ ohos_shared_library("utils") { ########## modules for `c_utils` in rust ########## # rust compiler is not supportted on mac -if (host_os == "linux" && host_cpu != "arm64" && !is_arkui_x && current_os != "mac") { +if (host_os == "linux" && host_cpu != "arm64" && !is_arkui_x && + current_os != "mac") { import("//build/templates/rust/rust_cxx.gni") # used for templates rust_cxx() rust_cxx("cxx_rust_gen") { sources = [ @@ -278,12 +279,7 @@ if (host_os == "linux" && host_cpu != "arm64" && !is_arkui_x && current_os != "m ] deps = [ ":cxx_rust_gen" ] - 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" ] - } + external_deps = [ "rust_cxx:cxx_cppdeps" ] public_external_deps = [ "bounds_checking_function:libsec_shared" ] subsystem_name = "commonlibrary" @@ -302,12 +298,7 @@ if (!is_arkui_x && !(host_os == "linux" && host_cpu == "arm64") && current_os != ] deps = [ ":utils_static_cxx_rust" ] - 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" ] - } + external_deps = [ "rust_cxx:lib" ] crate_root = "src/rust/lib.rs" crate_name = "utils_rust" diff --git a/base/test/unittest/rust/BUILD.gn b/base/test/unittest/rust/BUILD.gn index ee3a16f..48c3f66 100644 --- a/base/test/unittest/rust/BUILD.gn +++ b/base/test/unittest/rust/BUILD.gn @@ -44,13 +44,7 @@ if (host_os == "linux" && !is_asan && !is_arkui_x) { module_out_path = "c_utils/c_utils/rust" sources = [ "rust_utils_file_test.rs" ] deps = [ "//commonlibrary/c_utils/base:utils_rust" ] - - 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" ] - } + external_deps = [ "rust_cxx:lib" ] } ohos_rust_unittest("rust_utils_directory_test") { @@ -58,11 +52,6 @@ if (host_os == "linux" && !is_asan && !is_arkui_x) { sources = [ "rust_utils_directory_test.rs" ] deps = [ "//commonlibrary/c_utils/base:utils_rust" ] - 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" ] - } + external_deps = [ "rust_cxx:lib" ] } } -- Gitee