!24 适配openssl独立编译修改

Merge pull request !24 from 龙剑吟/master

bundle.json

@@ -35,6 +35,7 @@
       "inner_kits": [
         {
           "name" : "//third_party/rust/crates/rust-openssl/openssl:lib",
+          "type" : "rlib",
           "header": {
             "header_base": [],
             "header_files": []

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"
 }

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",

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\"",