diff --git a/openssl-macros/BUILD.gn b/openssl-macros/BUILD.gn index 8c46a91fa85891080d1b7d0cb61012b5b1e9b55c..955004a454e3eb7bd1ae3905285dcce598c1d1a1 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 121768f65d333166a63e4afdde1635a874f91fd2..2798aa1ff04f16b250626bbb8e43814321476fef 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 f8b979c1d669d0a2b6cfd36fb04f7d5d2b239e42..5b2c85a8316b68d8007aeabf96e47515a233161f 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=false rustflags = [ "--cfg=osslconf=\"OPENSSL_NO_BF\"", "--cfg=osslconf=\"OPENSSL_NO_IDEA\"",