From 5e5331b99d88f05a47fe08a8220a0e078838393b Mon Sep 17 00:00:00 2001 From: xingyuanfeng Date: Tue, 12 Aug 2025 16:24:29 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9Aprotobuf?= =?UTF-8?q?=E7=8B=AC=E7=AB=8B=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 --- bundle.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bundle.json b/bundle.json index 26c1d18..0b4defe 100644 --- a/bundle.json +++ b/bundle.json @@ -27,7 +27,9 @@ "third_party": [] }, "build": { - "sub_component": [], + "sub_component": [ + "//third_party/protobuf:protoc_static_lib" + ], "inner_kits": [ { "name": "//third_party/protobuf:protobuf" -- Gitee From c607378c3cfb4a5878a8fd328c59ca96c74a6cf0 Mon Sep 17 00:00:00 2001 From: xingyuanfeng Date: Fri, 15 Aug 2025 14:30:41 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9A=E7=8B=AC?= =?UTF-8?q?=E7=AB=8B=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 --- BUILD.gn | 7 +++++++ bundle.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index bfce7c5..e53797b 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -274,6 +274,13 @@ ohos_shared_library("protobuf") { part_name = "${THIRDPARTY_PROTOBUF_PART_NAME}" } +group("protobuf_static_host_toolchain") { + dep = [ + ":protobuf_static", + ":protobuf_static(${host_toolchain})" + ] +} + ohos_static_library("protobuf_static") { sources = [ "src/google/protobuf/any.cc", diff --git a/bundle.json b/bundle.json index 0b4defe..069f610 100644 --- a/bundle.json +++ b/bundle.json @@ -28,7 +28,7 @@ }, "build": { "sub_component": [ - "//third_party/protobuf:protoc_static_lib" + "//third_party/protobuf:protobuf_static_host_toolchain" ], "inner_kits": [ { -- Gitee From c32d49fb19096c2d3e7988598dd757fed360846a Mon Sep 17 00:00:00 2001 From: xingyuanfeng Date: Fri, 15 Aug 2025 07:18:25 +0000 Subject: [PATCH 3/4] update BUILD.gn. Signed-off-by: xingyuanfeng --- BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index e53797b..0a0feb1 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -274,8 +274,8 @@ ohos_shared_library("protobuf") { part_name = "${THIRDPARTY_PROTOBUF_PART_NAME}" } -group("protobuf_static_host_toolchain") { - dep = [ +group("protobuf_static_toolchain") { + deps = [ ":protobuf_static", ":protobuf_static(${host_toolchain})" ] -- Gitee From ef5a3fe4894aea9007461a51a470c12d532072a8 Mon Sep 17 00:00:00 2001 From: xingyuanfeng Date: Fri, 15 Aug 2025 07:18:59 +0000 Subject: [PATCH 4/4] update bundle.json. Signed-off-by: xingyuanfeng --- bundle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle.json b/bundle.json index 069f610..6bba460 100644 --- a/bundle.json +++ b/bundle.json @@ -28,7 +28,7 @@ }, "build": { "sub_component": [ - "//third_party/protobuf:protobuf_static_host_toolchain" + "//third_party/protobuf:protobuf_static_toolchain" ], "inner_kits": [ { -- Gitee