From 57594db552de7c30295fcc731914f471a8f4287c Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Fri, 1 Mar 2024 02:31:45 +0000 Subject: [PATCH 1/5] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E4=BE=9D=E8=B5=96bounds?= =?UTF-8?q?=5Fchecking=5Ffunction=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- bundle.json | 12 +++++++++++- interfaces/kits/js/BUILD.gn | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/bundle.json b/bundle.json index cf2c993..7032041 100644 --- a/bundle.json +++ b/bundle.json @@ -25,7 +25,8 @@ "hisysevent", "hilog", "napi", - "init" + "init", + "bounds_checking_function" ], "third_party": [ "bounds_checking_function" @@ -44,6 +45,15 @@ ] }, "name": "//base/customization/config_policy/frameworks/config_policy:configpolicy_util" + }, + { + "header": { + "header_base": "//base/customization/config_policy/interfaces/inner_api/include", + "header_files": [ + "config_policy_utils.h" + ] + }, + "name": "//base/customization/config_policy/frameworks/config_policy:configpolicy_util_for_init_static" } ], "test": [ diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn index 2ef6328..e89eb48 100644 --- a/interfaces/kits/js/BUILD.gn +++ b/interfaces/kits/js/BUILD.gn @@ -17,7 +17,6 @@ ohos_shared_library("configpolicy") { include_dirs = [ "include", "../../../interfaces/inner_api/include", - "//third_party/bounds_checking_function/include", "../../../frameworks/dfx/hisysevent_adapter", ] @@ -31,6 +30,7 @@ ohos_shared_library("configpolicy") { "hilog:libhilog", "hisysevent:libhisysevent", "napi:ace_napi", + "bounds_checking_function:libsec_shared", ] relative_install_dir = "module" subsystem_name = "customization" -- Gitee From 761317de67a193730b8cf5cd870e9975563fcf9e Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Fri, 1 Mar 2024 11:03:24 +0800 Subject: [PATCH 2/5] =?UTF-8?q?GUILD.gn=E6=96=87=E4=BB=B6=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- interfaces/kits/js/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn index e89eb48..215ed48 100644 --- a/interfaces/kits/js/BUILD.gn +++ b/interfaces/kits/js/BUILD.gn @@ -27,10 +27,10 @@ ohos_shared_library("configpolicy") { deps = [ "../../../frameworks/config_policy:configpolicy_util" ] external_deps = [ + "bounds_checking_function:libsec_shared", "hilog:libhilog", "hisysevent:libhisysevent", "napi:ace_napi", - "bounds_checking_function:libsec_shared", ] relative_install_dir = "module" subsystem_name = "customization" -- Gitee From 5dda8ddc2761af2fe9d6215086ba0952dba51cdc Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Mon, 4 Mar 2024 08:06:49 +0000 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=9A=E5=90=91?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E7=BB=99init=E7=9A=84visibility=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- bundle.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bundle.json b/bundle.json index 7032041..10893ee 100644 --- a/bundle.json +++ b/bundle.json @@ -53,7 +53,8 @@ "config_policy_utils.h" ] }, - "name": "//base/customization/config_policy/frameworks/config_policy:configpolicy_util_for_init_static" + "name": "//base/customization/config_policy/frameworks/config_policy:configpolicy_util_for_init_static", + "visibility": ["init"] } ], "test": [ -- Gitee From 688d090bca7641cabc6ee0087858ea7673c0ece6 Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Tue, 5 Mar 2024 06:46:26 +0000 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8E=BB=E6=8E=89bundle.json=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=ADthird=5Fparty=E7=9A=84bounds=5Fchecking=5Ffun?= =?UTF-8?q?ction=E9=83=A8=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- bundle.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bundle.json b/bundle.json index 10893ee..2eb63d4 100644 --- a/bundle.json +++ b/bundle.json @@ -28,9 +28,7 @@ "init", "bounds_checking_function" ], - "third_party": [ - "bounds_checking_function" - ] + "third_party": [] }, "build": { "sub_component": [ -- Gitee From a5efd8d7ca43a97ba9103240f6e91283dd727ae5 Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Tue, 5 Mar 2024 09:18:04 +0000 Subject: [PATCH 5/5] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E4=BE=9D=E8=B5=96=E9=83=A8=E4=BB=B6"bounds=5Fchecking?= =?UTF-8?q?=5Ffunction"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- bundle.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bundle.json b/bundle.json index 2eb63d4..10893ee 100644 --- a/bundle.json +++ b/bundle.json @@ -28,7 +28,9 @@ "init", "bounds_checking_function" ], - "third_party": [] + "third_party": [ + "bounds_checking_function" + ] }, "build": { "sub_component": [ -- Gitee