From 4380526ace790900eff25e6cd6f5f18d180fb1cc Mon Sep 17 00:00:00 2001 From: ljy9810 Date: Tue, 4 Mar 2025 14:24:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=80=82=E9=85=8Dopenssl=E7=8B=AC=E7=AB=8B?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ljy9810 --- openssl-macros/BUILD.gn | 4 +--- openssl-sys/BUILD.gn | 4 +++- openssl/BUILD.gn | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/openssl-macros/BUILD.gn b/openssl-macros/BUILD.gn index 8c46a91..955004a 100644 --- a/openssl-macros/BUILD.gn +++ b/openssl-macros/BUILD.gn @@ -13,7 +13,7 @@ import("//build/ohos.gni") -ohos_cargo_crate("lib") { +ohos_cargo_crate("lib_macros") { crate_name = "openssl_macros" crate_type = "proc-macro" crate_root = "src/lib.rs" @@ -28,6 +28,4 @@ ohos_cargo_crate("lib") { "//third_party/rust/crates/quote:lib", "//third_party/rust/crates/syn:lib", ] - subsystem_name = "thirdparty" - part_name = "rust_rust-openssl" } diff --git a/openssl-sys/BUILD.gn b/openssl-sys/BUILD.gn index 121768f..2798aa1 100644 --- a/openssl-sys/BUILD.gn +++ b/openssl-sys/BUILD.gn @@ -13,7 +13,7 @@ import("//build/ohos.gni") -ohos_cargo_crate("lib") { +ohos_cargo_crate("lib_sys") { crate_name = "openssl_sys" crate_type = "rlib" crate_root = "src/lib.rs" @@ -29,6 +29,8 @@ ohos_cargo_crate("lib") { "openssl:libcrypto_shared", "openssl:libssl_shared", ] + module_output_extension = ".rlib" + install_enable=false rustflags = [ "--cfg=const_fn", "--cfg=openssl", diff --git a/openssl/BUILD.gn b/openssl/BUILD.gn index f8b979c..3fab304 100644 --- a/openssl/BUILD.gn +++ b/openssl/BUILD.gn @@ -30,10 +30,12 @@ ohos_cargo_crate("lib") { "//third_party/rust/crates/foreign-types/foreign-types/:lib", "//third_party/rust/crates/libc:lib", "//third_party/rust/crates/once_cell:lib", - "//third_party/rust/crates/rust-openssl/openssl-macros:lib(${host_toolchain})", - "//third_party/rust/crates/rust-openssl/openssl-sys:lib", + "//third_party/rust/crates/rust-openssl/openssl-macros:lib_macros(${host_toolchain})", + "//third_party/rust/crates/rust-openssl/openssl-sys:lib_sys", ] + module_output_extension = ".rlib" features = [ "default" ] + install_enable=fasle rustflags = [ "--cfg=osslconf=\"OPENSSL_NO_BF\"", "--cfg=osslconf=\"OPENSSL_NO_IDEA\"", -- Gitee From 1e3c74defb63e05d7ad580e5bf2f7af246d5e390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=99=E5=89=91=E5=90=9F?= Date: Wed, 5 Mar 2025 01:06:48 +0000 Subject: [PATCH 2/2] update openssl/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 龙剑吟 --- openssl/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openssl/BUILD.gn b/openssl/BUILD.gn index 3fab304..5b2c85a 100644 --- a/openssl/BUILD.gn +++ b/openssl/BUILD.gn @@ -35,7 +35,7 @@ ohos_cargo_crate("lib") { ] module_output_extension = ".rlib" features = [ "default" ] - install_enable=fasle + install_enable=false rustflags = [ "--cfg=osslconf=\"OPENSSL_NO_BF\"", "--cfg=osslconf=\"OPENSSL_NO_IDEA\"", -- Gitee