From ef6560093db96296e4f3bf2d9d58fa1a2870c044 Mon Sep 17 00:00:00 2001 From: l60055366 Date: Thu, 23 Jan 2025 11:24:43 +0800 Subject: [PATCH 1/8] =?UTF-8?q?dm=E6=A8=A1=E5=9D=97=E4=BE=9D=E8=B5=96opens?= =?UTF-8?q?sl=E7=BB=9D=E5=AF=B9=E8=B7=AF=E5=BE=84=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: l60055366 --- services/service/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/service/BUILD.gn b/services/service/BUILD.gn index 18e144a9e..a0289b82b 100644 --- a/services/service/BUILD.gn +++ b/services/service/BUILD.gn @@ -100,7 +100,7 @@ if (defined(ohos_lite)) { "//foundation/systemabilitymgr/safwk_lite:safwk_lite", "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", "//third_party/bounds_checking_function:libsec_shared", - "//third_party/openssl:libcrypto_shared", + "openssl:libcrypto_shared", ] cflags = [ -- Gitee From 67a5e735f4accb54dd35532d8100c40583a7c829 Mon Sep 17 00:00:00 2001 From: l60055366 Date: Thu, 23 Jan 2025 11:29:57 +0800 Subject: [PATCH 2/8] =?UTF-8?q?dm=E6=A8=A1=E5=9D=97=E4=BE=9D=E8=B5=96opens?= =?UTF-8?q?sl=E7=BB=9D=E5=AF=B9=E8=B7=AF=E5=BE=84=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: l60055366 --- utils/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 841f4d0d0..41b842898 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -64,7 +64,7 @@ if (defined(ohos_lite)) { deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//third_party/bounds_checking_function:libsec_shared", - "//third_party/openssl:libcrypto_shared", + "openssl:libcrypto_shared", ] } } -- Gitee From 099836eca592d61e4706b93ef16c44ced15715eb Mon Sep 17 00:00:00 2001 From: l60055366 Date: Thu, 23 Jan 2025 13:37:45 +0800 Subject: [PATCH 3/8] =?UTF-8?q?dm=E6=A8=A1=E5=9D=97=E4=BE=9D=E8=B5=96opens?= =?UTF-8?q?sl=E7=BB=9D=E5=AF=B9=E8=B7=AF=E5=BE=84=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: l60055366 --- services/service/BUILD.gn | 2 +- utils/BUILD.gn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/service/BUILD.gn b/services/service/BUILD.gn index a0289b82b..5949e9125 100644 --- a/services/service/BUILD.gn +++ b/services/service/BUILD.gn @@ -99,8 +99,8 @@ if (defined(ohos_lite)) { "//foundation/communication/dsoftbus:dsoftbus", "//foundation/systemabilitymgr/safwk_lite:safwk_lite", "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", - "//third_party/bounds_checking_function:libsec_shared", "openssl:libcrypto_shared", + "//third_party/bounds_checking_function:libsec_shared", ] cflags = [ diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 41b842898..c5c35b1ea 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -63,8 +63,8 @@ if (defined(ohos_lite)) { deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//third_party/bounds_checking_function:libsec_shared", "openssl:libcrypto_shared", + "//third_party/bounds_checking_function:libsec_shared", ] } } -- Gitee From 3088cf6a88a0ce61d92a8efafbde6e8357a9f50a Mon Sep 17 00:00:00 2001 From: l60055366 Date: Thu, 23 Jan 2025 14:13:49 +0800 Subject: [PATCH 4/8] =?UTF-8?q?dm=E6=A8=A1=E5=9D=97=E4=BE=9D=E8=B5=96opens?= =?UTF-8?q?sl=E7=BB=9D=E5=AF=B9=E8=B7=AF=E5=BE=84=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: l60055366 --- services/service/BUILD.gn | 3 ++- utils/BUILD.gn | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/services/service/BUILD.gn b/services/service/BUILD.gn index 5949e9125..57e8e91b7 100644 --- a/services/service/BUILD.gn +++ b/services/service/BUILD.gn @@ -99,10 +99,11 @@ if (defined(ohos_lite)) { "//foundation/communication/dsoftbus:dsoftbus", "//foundation/systemabilitymgr/safwk_lite:safwk_lite", "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", - "openssl:libcrypto_shared", "//third_party/bounds_checking_function:libsec_shared", ] + external_deps = [ "openssl:libcrypto_shared" ] + cflags = [ "-Wall", "-O2", diff --git a/utils/BUILD.gn b/utils/BUILD.gn index c5c35b1ea..c151889f6 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -63,9 +63,10 @@ if (defined(ohos_lite)) { deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "openssl:libcrypto_shared", "//third_party/bounds_checking_function:libsec_shared", ] + + external_deps = [ "openssl:libcrypto_shared" ] } } } else { -- Gitee From 4324c25860ce95df1c20bf198dca34236c6a4786 Mon Sep 17 00:00:00 2001 From: l60055366 Date: Thu, 23 Jan 2025 14:40:28 +0800 Subject: [PATCH 5/8] =?UTF-8?q?dm=E6=A8=A1=E5=9D=97=E4=BE=9D=E8=B5=96opens?= =?UTF-8?q?sl=E7=BB=9D=E5=AF=B9=E8=B7=AF=E5=BE=84=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: l60055366 --- utils/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/BUILD.gn b/utils/BUILD.gn index c151889f6..d788779a2 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -65,7 +65,7 @@ if (defined(ohos_lite)) { "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//third_party/bounds_checking_function:libsec_shared", ] - + external_deps = [ "openssl:libcrypto_shared" ] } } -- Gitee From cb403061c6767d1b2a7e3e8c6661f096e74f9d88 Mon Sep 17 00:00:00 2001 From: l60055366 Date: Sun, 26 Jan 2025 13:00:01 +0800 Subject: [PATCH 6/8] =?UTF-8?q?dm=E6=A8=A1=E5=9D=97=E4=BE=9D=E8=B5=96opens?= =?UTF-8?q?sl=E7=BB=9D=E5=AF=B9=E8=B7=AF=E5=BE=84=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: l60055366 --- services/service/BUILD.gn | 6 ++++-- utils/BUILD.gn | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/services/service/BUILD.gn b/services/service/BUILD.gn index 57e8e91b7..8481dfb90 100644 --- a/services/service/BUILD.gn +++ b/services/service/BUILD.gn @@ -99,10 +99,12 @@ if (defined(ohos_lite)) { "//foundation/communication/dsoftbus:dsoftbus", "//foundation/systemabilitymgr/safwk_lite:safwk_lite", "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", - "//third_party/bounds_checking_function:libsec_shared", ] - external_deps = [ "openssl:libcrypto_shared" ] + external_deps = [ + "bounds_checking_function:libsec_shared", + "openssl:libcrypto_shared", + ] cflags = [ "-Wall", diff --git a/utils/BUILD.gn b/utils/BUILD.gn index d788779a2..e78bec1ad 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -63,10 +63,12 @@ if (defined(ohos_lite)) { deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//third_party/bounds_checking_function:libsec_shared", ] - external_deps = [ "openssl:libcrypto_shared" ] + external_deps = [ + "bounds_checking_function:libsec_shared", + "openssl:libcrypto_shared", + ] } } } else { -- Gitee From 80d22428c60cdc349936b8aa4ff529cd644ece74 Mon Sep 17 00:00:00 2001 From: l60055366 Date: Sun, 26 Jan 2025 13:48:30 +0800 Subject: [PATCH 7/8] =?UTF-8?q?dm=E6=A8=A1=E5=9D=97=E4=BE=9D=E8=B5=96opens?= =?UTF-8?q?sl=E7=BB=9D=E5=AF=B9=E8=B7=AF=E5=BE=84=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: l60055366 --- utils/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/BUILD.gn b/utils/BUILD.gn index e78bec1ad..752d86f3f 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -67,7 +67,7 @@ if (defined(ohos_lite)) { external_deps = [ "bounds_checking_function:libsec_shared", - "openssl:libcrypto_shared", + "openssl:libcrypto_shared", ] } } -- Gitee From 11abfbde44d96f810bcdba060c33bac69a40629e Mon Sep 17 00:00:00 2001 From: l60055366 Date: Sun, 26 Jan 2025 14:38:39 +0800 Subject: [PATCH 8/8] =?UTF-8?q?dm=E6=A8=A1=E5=9D=97=E4=BE=9D=E8=B5=96opens?= =?UTF-8?q?sl=E7=BB=9D=E5=AF=B9=E8=B7=AF=E5=BE=84=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: l60055366 --- utils/BUILD.gn | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 752d86f3f..e17809f83 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -61,14 +61,11 @@ if (defined(ohos_lite)) { "lOG_DOMAIN=0xD004110", ] - deps = [ - "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - ] - + deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared" ] external_deps = [ "bounds_checking_function:libsec_shared", "openssl:libcrypto_shared", - ] + ] } } } else { -- Gitee