From e087c960a3659549299bd4a6a925b57bb6e56479 Mon Sep 17 00:00:00 2001 From: flying Date: Wed, 31 Jan 2024 00:56:29 +0000 Subject: [PATCH 1/3] update BUILD.gn. Signed-off-by: flying --- BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index af83609ad..47c4df451 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -46,7 +46,7 @@ if (defined(ohos_lite)) { config("mbedtls_config") { include_dirs = MBEDTLS_INLCUDE_DIRS - include_dirs += [ "//third_party/bounds_checking_function/include" ] + external_deps = [ "bounds_checking_function:libsec_shared" ] if (ohos_kernel_type == "liteos_m") { defines += [ "__unix__", @@ -125,7 +125,7 @@ if (defined(ohos_lite)) { import("//build/ohos.gni") config("mbedtls_config") { include_dirs = MBEDTLS_INLCUDE_DIRS - include_dirs += [ "//third_party/bounds_checking_function/include" ] + external_deps = [ "bounds_checking_function:libsec_shared" ] } ohos_shared_library("mbedtls_shared") { -- Gitee From c8b49ee3a25afb2fb038c7cdd84ce4e94527a251 Mon Sep 17 00:00:00 2001 From: flying Date: Mon, 5 Feb 2024 09:25:11 +0000 Subject: [PATCH 2/3] update BUILD.gn. Signed-off-by: flying --- BUILD.gn | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 47c4df451..c5a84917e 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -61,21 +61,21 @@ if (defined(ohos_lite)) { } } - lite_library("mbedtls_shared") { + ohos_shared_library("mbedtls") { target_type = "shared_library" public_configs = [ ":mbedtls_config" ] output_name = "mbedtls" sources = MBEDTLS_SOURCES } - lite_library("mbedtls_static") { + ohos_shared_library("mbedtls_static") { target_type = "static_library" public_configs = [ ":mbedtls_config" ] output_name = "mbedtls" sources = MBEDTLS_SOURCES } - group("mbedtls") { + ohos_shared_library("mbedtls") { if (ohos_kernel_type == "liteos_m") { if (ohos_security_huks_mbedtls_porting_path != "") { public_deps = [ ohos_security_huks_mbedtls_porting_path ] @@ -115,7 +115,7 @@ if (defined(ohos_lite)) { ] } - static_library("mbedtls_gt") { + ohos_shared_library("mbedtls_gt") { sources = MBEDTLS_SOURCES output_name = "mbedtls_gt" public_configs = [ ":mbedtls_profile_test" ] @@ -144,7 +144,8 @@ if (defined(ohos_lite)) { ] } - group("mbedtls") { + ohos_shared_library("mbedtls") { public_deps = [ ":mbedtls_shared" ] } } + -- Gitee From aaa802cf747265fb0bd70debd4e36b65782020d9 Mon Sep 17 00:00:00 2001 From: flying Date: Mon, 5 Feb 2024 09:25:46 +0000 Subject: [PATCH 3/3] update bundle.json. Signed-off-by: flying --- bundle.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bundle.json b/bundle.json index 272885909..23113a0c9 100755 --- a/bundle.json +++ b/bundle.json @@ -38,6 +38,10 @@ ] }, "name" : "//third_party/mbedtls:mbedtls_shared" + }, + { + "header" : {}, + "name" : "//third_party/mbedtls:mbedtls" } ], "test": [] -- Gitee