From ef16a8e9548110a1feb66335d1c2a1e94b68d2be Mon Sep 17 00:00:00 2001
From: sunyaozu <sunyaozu@huawei.com>
Date: Mon, 11 Mar 2024 11:24:11 +0800
Subject: [PATCH 1/2] icu bundle reform

Signed-off-by: sunyaozu <sunyaozu@huawei.com>
---
 bundle.json    | 20 +++-----------------
 icu4c/BUILD.gn |  5 ++++-
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/bundle.json b/bundle.json
index 5388af1c..3ab0189f 100644
--- a/bundle.json
+++ b/bundle.json
@@ -23,19 +23,11 @@
         },
         "build": {
             "sub_component": [
-                "//third_party/icu/icu4c:ohos_icudat",
                 "//third_party/icu/icu4c:shared_icuuc",
                 "//third_party/icu/icu4c:shared_icui18n",
                 "//third_party/icu/ohos_icu4c:icundk"
             ],
             "inner_kits": [
-                {
-                    "name": "//third_party/icu/icu4c:ohos_icudat",
-                    "header": {
-                        "header_files": [],
-                        "header_base": []
-                    }
-                },
                 {
                     "name": "//third_party/icu/icu4c:shared_icuuc",
                     "header": {
@@ -72,7 +64,6 @@
                             "norm2allmodes.h",
                             "norm2_nfc_data.h",
                             "normalizer2impl.h",
-                            "ohos/init_data.h",
                             "patternprops.h",
                             "pluralmap.h",
                             "propname.h",
@@ -258,10 +249,7 @@
                             "unicode/uvernum.h",
                             "unicode/uversion.h"
                         ],
-                        "header_base": [
-                            "//third_party/icu/icu4c/source",
-                            "//third_party/icu/icu4c/source/common"
-                        ]
+                        "header_base": "//third_party/icu/icu4c/source/common"
                     }
                 },
                 {
@@ -534,16 +522,14 @@
                             "unicode/utrans.h",
                             "unicode/vtzone.h"
                         ],
-                        "header_base": [
-                            "//third_party/icu/icu4c/source/i18n"
-                        ]
+                        "header_base": "//third_party/icu/icu4c/source/i18n"
                     }
                 },
                 {
                     "name": "//third_party/icu/ohos_icu4c:icundk",
                     "header": {
                         "header_files": [],
-                        "header_base": []
+                        "header_base": "//third_party/icu/ohos_icu4c"
                     }
                 }
             ],
diff --git a/icu4c/BUILD.gn b/icu4c/BUILD.gn
index 66e0360c..eaee344d 100644
--- a/icu4c/BUILD.gn
+++ b/icu4c/BUILD.gn
@@ -536,7 +536,10 @@ ohos_shared_library("shared_icuuc") {
     "_REENTRANT",
   ]
   sources = icu_common_source
-  deps = [ ":static_icustubdata" ]
+  deps = [
+    ":ohos_icudat",
+    ":static_icustubdata"
+  ]
   cflags_cc = [
     "-O3",
     "-W",
-- 
Gitee


From c223eba69abddf7ef5ec1912b8ad4300cad049e3 Mon Sep 17 00:00:00 2001
From: zhangdd_ewan <zhangdongdong50@huawei.com>
Date: Mon, 11 Mar 2024 11:54:24 +0000
Subject: [PATCH 2/2] update icu4c/BUILD.gn.

Signed-off-by: zhangdd_ewan <zhangdongdong50@huawei.com>
---
 icu4c/BUILD.gn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icu4c/BUILD.gn b/icu4c/BUILD.gn
index eaee344d..155c0f16 100644
--- a/icu4c/BUILD.gn
+++ b/icu4c/BUILD.gn
@@ -538,7 +538,7 @@ ohos_shared_library("shared_icuuc") {
   sources = icu_common_source
   deps = [
     ":ohos_icudat",
-    ":static_icustubdata"
+    ":static_icustubdata",
   ]
   cflags_cc = [
     "-O3",
-- 
Gitee