From 76829cb595b60008de3d650016597cf8e2b1915b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E6=B1=B6=E9=92=8A?= Date: Thu, 12 Sep 2024 06:47:24 +0000 Subject: [PATCH 1/2] cherry pick 1e2f320 from https://gitee.com/han-wenzhao/third_party_glib/pulls/71 update BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 韩汶钊 --- BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/BUILD.gn b/BUILD.gn index 00b2b7d..613d493 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -9,6 +9,7 @@ exec_script("install.sh", [ "$glib_path" ]) PCRE2_LIB_DIR = "//third_party/pcre2/pcre2" ohos_shared_library("glibpcre") { + branch_protector_ret = "pac_ret" md5_check_script = rebase_path("$PCRE2_LIB_DIR/check_md5.sh") _arguments_config = [ rebase_path("$PCRE2_LIB_DIR/src/config.h.generic"), -- Gitee From e4a0a8c0b112dc6e51a7d60e2b2b59997911fa7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E6=B1=B6=E9=92=8A?= Date: Tue, 10 Sep 2024 11:59:13 +0000 Subject: [PATCH 2/2] =?UTF-8?q?cherry=20pick=20fa690b6=20from=20https://gi?= =?UTF-8?q?tee.com/han-wenzhao/third=5Fparty=5Fglib/pulls/71=20=E9=80=82?= =?UTF-8?q?=E9=85=8DDFX?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 韩汶钊 --- BUILD.gn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/BUILD.gn b/BUILD.gn index 613d493..9c51820 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -152,6 +152,7 @@ config("glib_config") { } ohos_source_set("glib_source") { + branch_protector_ret = "pac_ret" sources = [ "glib/deprecated/gallocator.c", "glib/deprecated/gcache.c", @@ -259,6 +260,7 @@ config("public_header_config") { } ohos_shared_library("glib") { + branch_protector_ret = "pac_ret" deps = [ ":glib_source", "//third_party/glib:glibpcre", @@ -366,6 +368,7 @@ config("g_mem_dfx_config") { } ohos_shared_library("g_mem_dfx") { + branch_protector_ret = "pac_ret" sources = [ "glibmemdfx/gmemdfx.cpp" ] include_dirs = [ "//commonlibrary/c_utils/base/include" ] -- Gitee