From 88ac901a1043b4e4f833e43ff213ab207e222196 Mon Sep 17 00:00:00 2001 From: Luming Date: Mon, 23 Jun 2025 13:27:17 +0800 Subject: [PATCH 1/2] =?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 --- BUILD.gn | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 83a6c8c..42e0c63 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -24,16 +24,9 @@ ohos_rust_shared_library("lib") { sources = [ "src/lib.rs" ] - deps = [ - "//third_party/rust/crates/serde/serde:lib", - ] + deps = [ "//third_party/rust/crates/serde/serde:lib" ] - if (defined(global_parts_info) && - !defined(global_parts_info.third_party_rust_libc)) { - deps += [ "//third_party/rust/crates/libc:lib" ] - } else { - external_deps += [ "rust_libc:lib" ] - } + external_deps += [ "rust_libc:lib" ] features = [ "default", @@ -51,12 +44,7 @@ ohos_rust_unittest("rust_ylong_json_unit_test") { "//third_party/rust/crates/serde/serde:lib", ] - if (defined(global_parts_info) && - !defined(global_parts_info.third_party_rust_libc)) { - deps += [ "//third_party/rust/crates/libc:lib" ] - } else { - external_deps += [ "rust_libc:lib" ] - } + external_deps += [ "rust_libc:lib" ] if (defined(global_parts_info) && !defined(global_parts_info.third_party_rust_serde)) { @@ -79,4 +67,4 @@ group("unittest") { if (!use_clang_coverage) { deps += [ ":rust_ylong_json_unit_test" ] } -} \ No newline at end of file +} -- Gitee From 72d3d75a1a74f98b722f885fa53ab883c829b11d Mon Sep 17 00:00:00 2001 From: Luming Date: Thu, 3 Jul 2025 22:16:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?rust=5Flibc=E9=83=A8=E4=BB=B6=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Luming --- BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 42e0c63..9903488 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -26,7 +26,7 @@ ohos_rust_shared_library("lib") { deps = [ "//third_party/rust/crates/serde/serde:lib" ] - external_deps += [ "rust_libc:lib" ] + external_deps = [ "rust_libc:lib" ] features = [ "default", @@ -44,7 +44,7 @@ ohos_rust_unittest("rust_ylong_json_unit_test") { "//third_party/rust/crates/serde/serde:lib", ] - external_deps += [ "rust_libc:lib" ] + external_deps = [ "rust_libc:lib" ] if (defined(global_parts_info) && !defined(global_parts_info.third_party_rust_serde)) { -- Gitee