From 382297a92b6630d7c389333f1e5cb0c68dc6e8c3 Mon Sep 17 00:00:00 2001 From: ljy9810 Date: Fri, 14 Feb 2025 09:30:21 +0800 Subject: [PATCH] =?UTF-8?q?third=5Fparty=5Frust=5Frust-openssl=20=E9=80=82?= =?UTF-8?q?=E9=85=8Dopenssl=E7=8B=AC=E7=AB=8B=E7=BC=96=E8=AF=91=E9=85=8D?= =?UTF-8?q?=E5=A5=97=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ljy9810 --- bundle.json | 3 ++- services/key_enable/BUILD.gn | 12 ++++++++---- test/unittest/BUILD.gn | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/bundle.json b/bundle.json index b344930..784acc6 100644 --- a/bundle.json +++ b/bundle.json @@ -46,7 +46,8 @@ "fsverity-utils", "screenlock_mgr", "common_event_service", - "bounds_checking_function" + "bounds_checking_function", + "rust_rust-openssl" ], "third_party": [] }, diff --git a/services/key_enable/BUILD.gn b/services/key_enable/BUILD.gn index e58f2d4..dc26b9e 100644 --- a/services/key_enable/BUILD.gn +++ b/services/key_enable/BUILD.gn @@ -31,11 +31,13 @@ ohos_rust_executable("key_enable") { external_deps = common_external_deps if (!ohos_indep_compiler_enable) { deps += [ - "${rust_openssl_dir}/openssl:lib", "//third_party/rust/crates/cxx:lib", "//third_party/rust/crates/lazy-static.rs:lib", ] - external_deps += [ "c_utils:utils_rust" ] + external_deps += [ + "c_utils:utils_rust", + "rust_rust-openssl:lib", + ] } rustenv = [] if (build_variant == "root") { @@ -60,11 +62,13 @@ ohos_rust_shared_ffi("key_enable_lib") { external_deps = common_external_deps if (!ohos_indep_compiler_enable) { deps += [ - "${rust_openssl_dir}/openssl:lib", "//third_party/rust/crates/cxx:lib", "//third_party/rust/crates/lazy-static.rs:lib", ] - external_deps += [ "c_utils:utils_rust" ] + external_deps += [ + "c_utils:utils_rust", + "rust_rust-openssl:lib", + ] } rustenv = [] if (build_variant == "root") { diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index de6687e..f3c6b09 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -277,7 +277,6 @@ ohos_rust_static_library("rust_key_enable_lib") { sources = [ "${code_signature_root_dir}/services/key_enable/src/lib.rs" ] deps = [ "${code_signature_root_dir}/services/key_enable/utils:libkey_enable_utils", - "${rust_openssl_dir}/openssl:lib", "//third_party/rust/crates/cxx:lib", "//third_party/rust/crates/lazy-static.rs:lib", ] @@ -285,6 +284,7 @@ ohos_rust_static_library("rust_key_enable_lib") { "c_utils:utils_rust", "hilog:hilog_rust", "hisysevent:hisysevent_rust", + "rust_rust-openssl:lib", "ylong_json:lib", ] rustenv = [] -- Gitee