From b487998d20b9173e1c101089c8ffcf08092df7a2 Mon Sep 17 00:00:00 2001
From: ganchuantao <ganchuantao1@huawei.com>
Date: Wed, 10 Sep 2025 14:28:01 +0800
Subject: [PATCH] sync code to 6.0release

Signed-off-by: ganchuantao <ganchuantao1@huawei.com>
Change-Id: I2a4fa452faa0835af86551afac811bfc854e8408
---
 BUILD.gn    | 9 ++++++++-
 bundle.json | 4 +++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index bfce7c5..4934fb1 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -274,6 +274,13 @@ ohos_shared_library("protobuf") {
   part_name = "${THIRDPARTY_PROTOBUF_PART_NAME}"
 }
 
+group("protobuf_static_toolchain") {
+  deps = [
+    ":protobuf_static",
+    ":protobuf_static(${host_toolchain})"
+  ]
+}
+
 ohos_static_library("protobuf_static") {
   sources = [
     "src/google/protobuf/any.cc",
@@ -751,4 +758,4 @@ ohos_executable("protoc") {
   install_enable = false
   subsystem_name = "${THIRDPARTY_PROTOBUF_SUBSYS_NAME}"
   part_name = "${THIRDPARTY_PROTOBUF_PART_NAME}"
-}
+}
\ No newline at end of file
diff --git a/bundle.json b/bundle.json
index 3056a87..f4b787a 100644
--- a/bundle.json
+++ b/bundle.json
@@ -27,7 +27,9 @@
             "third_party": []
         },
         "build": {
-            "sub_component": [],
+            "sub_component": [
+                "//third_party/protobuf:protobuf_static_toolchain"
+            ],
             "inner_kits": [
                 {
                     "header": {
-- 
Gitee