From dbe56044784da3a4102a12548b020279b8d33568 Mon Sep 17 00:00:00 2001 From: xingyuanfeng Date: Wed, 15 May 2024 15:41:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=96=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xingyuanfeng --- BUILD.gn | 10 +++++----- bundle.json | 7 +++---- napi/BUILD.gn | 9 +++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 6d7e3d2..fd0df91 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -53,12 +53,12 @@ ohos_executable("syscap_tool_bin") { sources = [ "./src/main.c" ] sources += sources_platform_common - deps += [ "//third_party/bounds_checking_function:libsec_static" ] + external_deps = [ "bounds_checking_function:libsec_static" ] if (defined(ohos_lite)) { deps += [ "//build/lite/config/component/cJSON:cjson_static" ] } else { - deps += [ "//third_party/cJSON:cjson_static" ] + external_deps += [ "cJSON:cjson_static" ] } subsystem_name = "developtools" @@ -122,9 +122,9 @@ if (defined(ohos_lite)) { "./src/endian_internal.c", "./src/syscap_tool.c", ] - deps += [ - "//third_party/bounds_checking_function:libsec_static", - "//third_party/cJSON:cjson_static", + external_deps = [ + "bounds_checking_function:libsec_static", + "cJSON:cjson_static", ] subsystem_name = "developtools" diff --git a/bundle.json b/bundle.json index 4b92c28..6d5657c 100644 --- a/bundle.json +++ b/bundle.json @@ -22,12 +22,11 @@ "ram": "0", "deps": { "components": [ - "napi" - ], - "third_party": [ + "napi", "bounds_checking_function", "cJSON" - ] + ], + "third_party": [] }, "build": { "sub_component": [ diff --git a/napi/BUILD.gn b/napi/BUILD.gn index dc518c7..0490604 100644 --- a/napi/BUILD.gn +++ b/napi/BUILD.gn @@ -42,9 +42,10 @@ ohos_shared_library("systemcapability") { sources = [ "napi_query_syscap.cpp" ] sources += sources_platform_common - deps = [ - ":query_syscap_js", - "//third_party/bounds_checking_function:libsec_static", + deps = [ ":query_syscap_js" ] + external_deps = [ + "bounds_checking_function:libsec_static", + "napi:ace_napi" ] if (syscap_codec_config_extern_path != "") { @@ -59,7 +60,7 @@ ohos_shared_library("systemcapability") { if (defined(ohos_lite)) { deps += [ "//build/lite/config/component/cJSON:cjson_static" ] } else { - deps += [ "//third_party/cJSON:cjson_static" ] + external_deps += [ "cJSON:cjson_static" ] } relative_install_dir = "module" -- Gitee From 1324cf7d87abe097a001645bd3be1d702fafe37a Mon Sep 17 00:00:00 2001 From: xingyuanfeng Date: Wed, 15 May 2024 16:07:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=8B=AC=E7=AB=8B?= =?UTF-8?q?=E7=BC=96=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xingyuanfeng --- napi/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/napi/BUILD.gn b/napi/BUILD.gn index 0490604..5862672 100644 --- a/napi/BUILD.gn +++ b/napi/BUILD.gn @@ -55,7 +55,6 @@ ohos_shared_library("systemcapability") { cflags = [ "-DSYSCAP_DEFINE_EXTERN_ENABLE" ] } - external_deps = [ "napi:ace_napi" ] if (defined(ohos_lite)) { deps += [ "//build/lite/config/component/cJSON:cjson_static" ] -- Gitee From 47efa6e5d88947add03f9cd3b93bd488131dee1c Mon Sep 17 00:00:00 2001 From: xingyuanfeng Date: Wed, 15 May 2024 16:44:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E4=BB=B6?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xingyuanfeng --- napi/BUILD.gn | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/napi/BUILD.gn b/napi/BUILD.gn index 5862672..5db0659 100644 --- a/napi/BUILD.gn +++ b/napi/BUILD.gn @@ -45,7 +45,7 @@ ohos_shared_library("systemcapability") { deps = [ ":query_syscap_js" ] external_deps = [ "bounds_checking_function:libsec_static", - "napi:ace_napi" + "napi:ace_napi", ] if (syscap_codec_config_extern_path != "") { @@ -55,7 +55,6 @@ ohos_shared_library("systemcapability") { cflags = [ "-DSYSCAP_DEFINE_EXTERN_ENABLE" ] } - if (defined(ohos_lite)) { deps += [ "//build/lite/config/component/cJSON:cjson_static" ] } else { -- Gitee