From ec0b2c12ee4ab9696388e4d12a637f6b5f29cc15 Mon Sep 17 00:00:00 2001 From: lichao Date: Tue, 20 Feb 2024 15:39:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=83=A8=E4=BB=B6?= =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E7=BC=96=E8=AF=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lichao --- 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 5cdc6a09b3cc6cb77dc87c4e1eeea453e1eecb32 Mon Sep 17 00:00:00 2001 From: lichao Date: Mon, 26 Feb 2024 18:46:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=83=A8=E4=BB=B6?= =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E7=BC=96=E8=AF=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lichao --- BUILD.gn | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/BUILD.gn b/BUILD.gn index c41223a..efe193d 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 = [ @@ -96,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