From 916f6e949fd91775eb11f103ffb1db6669925a7c Mon Sep 17 00:00:00 2001 From: xingyuanfeng <1292110408@qq.com> Date: Thu, 29 Feb 2024 05:44:20 +0000 Subject: [PATCH 1/4] update BUILD.gn. Signed-off-by: xingyuanfeng <1292110408@qq.com> --- BUILD.gn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/BUILD.gn b/BUILD.gn index c41223a..e0ad6a1 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -16,6 +16,12 @@ import("//build/ohos.gni") PCRE2_LIB_DIR = "//third_party/pcre2/pcre2" +config("third_party_pcre2_config") { + include_dirs = [ + "$PCRE2_LIB_DIR/src" + ] +} + ohos_shared_library("libpcre2") { md5_check_script = rebase_path("$PCRE2_LIB_DIR/check_md5.sh") _arguments_config = [ -- Gitee From c458960d9961f364b3e7971ec239dd48bdcd1d12 Mon Sep 17 00:00:00 2001 From: xingyuanfeng <1292110408@qq.com> Date: Thu, 29 Feb 2024 05:44:52 +0000 Subject: [PATCH 2/4] update bundle.json. Signed-off-by: xingyuanfeng <1292110408@qq.com> --- bundle.json | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/bundle.json b/bundle.json index c935fa8..22f5321 100644 --- a/bundle.json +++ b/bundle.json @@ -24,7 +24,24 @@ }, "build": { "sub_component": [], - "inner_kits": [], + "inner_kits": [ + { + "name": "//third_party/pcre2:libpcre2", + "header": { + "header_files": [ + "pcre2_internal.h", + "pcre2_intmodedep.h", + "pcre2_jit_neon_inc.h", + "pcre2_jit_simd_inc.h", + "pcre2_ucp.h", + "pcre2posix.h", + "pcre2.h", + "config.h" + ], + "header_base": "//third_party/pcre2/pcre2/src" + } + } + ], "test": [] } } -- Gitee From c55b3ac83ff9faa336e8d30b55819b8378bc57c4 Mon Sep 17 00:00:00 2001 From: xingyuanfeng <1292110408@qq.com> Date: Thu, 29 Feb 2024 06:14:32 +0000 Subject: [PATCH 3/4] update BUILD.gn. Signed-off-by: xingyuanfeng <1292110408@qq.com> --- BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/BUILD.gn b/BUILD.gn index e0ad6a1..efe193d 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -102,6 +102,7 @@ ohos_shared_library("libpcre2") { "$PCRE2_LIB_DIR/src/pcre2_xclass.c", ] include_dirs = [ "$PCRE2_LIB_DIR/src" ] + public_configs = [ ":third_party_pcre2_config" ] cflags = [ "-D_GNU_SOURCE", "-DHAVE_CONFIG_H", -- Gitee From 9b145d2aa4ebec714ae1aea6cd0013b1e6249fbe Mon Sep 17 00:00:00 2001 From: zwx1283032 Date: Thu, 29 Feb 2024 15:51:34 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=95=B4gn=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zwx1283032 --- BUILD.gn | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index efe193d..9e57f78 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -17,9 +17,7 @@ import("//build/ohos.gni") PCRE2_LIB_DIR = "//third_party/pcre2/pcre2" config("third_party_pcre2_config") { - include_dirs = [ - "$PCRE2_LIB_DIR/src" - ] + include_dirs = [ "$PCRE2_LIB_DIR/src" ] } ohos_shared_library("libpcre2") { -- Gitee