From c1d66be9568ebb4b21dc75fc9bd93d27cb249f19 Mon Sep 17 00:00:00 2001 From: liuxiyao223 Date: Sat, 23 Mar 2024 16:13:49 +0800 Subject: [PATCH 1/7] build modify Signed-off-by: liuxiyao223 --- BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index 231887019..b731319e5 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -46,7 +46,6 @@ if (defined(ohos_lite)) { config("mbedtls_config") { include_dirs = MBEDTLS_INLCUDE_DIRS - include_dirs += [ "//third_party/bounds_checking_function/include" ] if (ohos_kernel_type == "liteos_m") { defines += [ "__unix__", -- Gitee From 594f6c40c7b1aa86f00f1e4a788be9d6a33712bc Mon Sep 17 00:00:00 2001 From: liuxiyao223 Date: Sat, 23 Mar 2024 16:52:23 +0800 Subject: [PATCH 2/7] build modify Signed-off-by: liuxiyao223 --- BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/BUILD.gn b/BUILD.gn index b731319e5..e680c5d8e 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -63,6 +63,7 @@ if (defined(ohos_lite)) { lite_library("mbedtls_shared") { target_type = "shared_library" public_configs = [ ":mbedtls_config" ] + external_deps = [ "bounds_checking_function:libsec_static" ] output_name = "mbedtls" sources = MBEDTLS_SOURCES } -- Gitee From 927e35f5eba0739c0c65be32500dd7a2ca74c891 Mon Sep 17 00:00:00 2001 From: liuxiyao223 Date: Sat, 23 Mar 2024 16:57:05 +0800 Subject: [PATCH 3/7] build modify Signed-off-by: liuxiyao223 --- BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/BUILD.gn b/BUILD.gn index e680c5d8e..09781b95d 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -71,6 +71,7 @@ if (defined(ohos_lite)) { lite_library("mbedtls_static") { target_type = "static_library" public_configs = [ ":mbedtls_config" ] + external_deps = [ "bounds_checking_function:libsec_static" ] output_name = "mbedtls" sources = MBEDTLS_SOURCES } -- Gitee From 7c80cc571c25f40adf3c7919514e5e5121219740 Mon Sep 17 00:00:00 2001 From: liuxiyao223 Date: Sat, 23 Mar 2024 17:19:12 +0800 Subject: [PATCH 4/7] build modify Signed-off-by: liuxiyao223 --- BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index 09781b95d..c7c8befeb 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -63,7 +63,6 @@ if (defined(ohos_lite)) { lite_library("mbedtls_shared") { target_type = "shared_library" public_configs = [ ":mbedtls_config" ] - external_deps = [ "bounds_checking_function:libsec_static" ] output_name = "mbedtls" sources = MBEDTLS_SOURCES } -- Gitee From 8f8a13e254ef696601519fd0a6ab6095c5e5b981 Mon Sep 17 00:00:00 2001 From: liuxiyao223 Date: Sat, 23 Mar 2024 17:30:55 +0800 Subject: [PATCH 5/7] build modify Signed-off-by: liuxiyao223 --- BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/BUILD.gn b/BUILD.gn index c7c8befeb..8fc65a186 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -63,6 +63,7 @@ if (defined(ohos_lite)) { lite_library("mbedtls_shared") { target_type = "shared_library" public_configs = [ ":mbedtls_config" ] + external_deps = [ "bounds_checking_function:libsec_shared" ] output_name = "mbedtls" sources = MBEDTLS_SOURCES } -- Gitee From 641672804d044ab0c1354e7b47eb03a633d9759b Mon Sep 17 00:00:00 2001 From: liuxiyao223 Date: Sat, 23 Mar 2024 17:56:35 +0800 Subject: [PATCH 6/7] build modify Signed-off-by: liuxiyao223 --- BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 8fc65a186..79fffc719 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -63,7 +63,7 @@ if (defined(ohos_lite)) { lite_library("mbedtls_shared") { target_type = "shared_library" public_configs = [ ":mbedtls_config" ] - external_deps = [ "bounds_checking_function:libsec_shared" ] + public_deps = [ "bounds_checking_function:libsec_shared" ] output_name = "mbedtls" sources = MBEDTLS_SOURCES } @@ -71,7 +71,7 @@ if (defined(ohos_lite)) { lite_library("mbedtls_static") { target_type = "static_library" public_configs = [ ":mbedtls_config" ] - external_deps = [ "bounds_checking_function:libsec_static" ] + public_deps = [ "bounds_checking_function:libsec_static" ] output_name = "mbedtls" sources = MBEDTLS_SOURCES } -- Gitee From 7f4807d18316bd9e4874deb02d0c28a7838b750e Mon Sep 17 00:00:00 2001 From: liuxiyao223 Date: Sat, 23 Mar 2024 18:20:23 +0800 Subject: [PATCH 7/7] build modify Signed-off-by: liuxiyao223 --- BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 79fffc719..2fa1ef253 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -63,7 +63,7 @@ if (defined(ohos_lite)) { lite_library("mbedtls_shared") { target_type = "shared_library" public_configs = [ ":mbedtls_config" ] - public_deps = [ "bounds_checking_function:libsec_shared" ] + public_deps = [ "//third_party/bounds_checking_function:libsec_shared" ] output_name = "mbedtls" sources = MBEDTLS_SOURCES } @@ -71,7 +71,7 @@ if (defined(ohos_lite)) { lite_library("mbedtls_static") { target_type = "static_library" public_configs = [ ":mbedtls_config" ] - public_deps = [ "bounds_checking_function:libsec_static" ] + public_deps = [ "//third_party/bounds_checking_function:libsec_static" ] output_name = "mbedtls" sources = MBEDTLS_SOURCES } -- Gitee