From 3c0623919fb599223db1444b435156936ed2ea60 Mon Sep 17 00:00:00 2001
From: xingshunxiang <xingshunxiang@huawei.com>
Date: Thu, 12 Jun 2025 22:46:20 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=96=E6=95=B4=E6=94=B9?=
 =?UTF-8?q?=E5=88=86=E6=94=AF=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Issue: https://gitee.com/openharmony/arkcompiler_ets_frontend/issues/ICETYB?from=project-issue
Description: 部件化整改分支同步
Reason: 部件化整改分支同步
Signed-off-by: xingshunxiang <xingshunxiang@huawei.com>
---
 bundle.json                                            |  6 +++---
 es2panda/BUILD.gn                                      | 10 ++++------
 ets2panda/BUILD.gn                                     | 10 ++++------
 .../lsp/include/services/text_change/change_tracker.h  |  1 -
 merge_abc/BUILD.gn                                     |  5 +++--
 5 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/bundle.json b/bundle.json
index 142291a602..213493d200 100644
--- a/bundle.json
+++ b/bundle.json
@@ -22,11 +22,11 @@
                 "runtime_core",
                 "zlib",
                 "bounds_checking_function",
-                "protobuf"
+                "protobuf",
+                "icu"
             ],
             "third_party": [
-                "json",
-                "icu"
+                "json"
             ]
         },
         "build": {
diff --git a/es2panda/BUILD.gn b/es2panda/BUILD.gn
index d7f663a2bb..bda0859580 100644
--- a/es2panda/BUILD.gn
+++ b/es2panda/BUILD.gn
@@ -395,20 +395,18 @@ ohos_static_library("es2panda_lib") {
   ]
 
   include_dirs = [
-    "${target_out_dir}",
-    "//third_party/icu/icu4c/source/common",
-    "//third_party/icu/icu4c/source/i18n",
-    "//third_party/icu/icu4c/source",
+    "${target_out_dir}"
   ]
 
   deps = [
     ":gen_isa_headers",
     ":gen_keywords_headers",
-    "$ark_third_party_root/icu/icu4c:static_icuuc",
     "../merge_abc:panda_assembly_proto_static",
   ]
 
-  external_deps = []
+  external_deps = [
+    "icu:static_icuuc"
+  ]
   if (!is_arkui_x) {
     external_deps += [
       "json:nlohmann_json_static",
diff --git a/ets2panda/BUILD.gn b/ets2panda/BUILD.gn
index 42c9d7f055..38a7fe8410 100644
--- a/ets2panda/BUILD.gn
+++ b/ets2panda/BUILD.gn
@@ -24,9 +24,6 @@ config("libes2panda_public_config") {
     "$target_gen_dir",
     "$target_gen_dir/include",
     "$target_gen_dir/generated",
-    "//third_party/icu/icu4c/source/common",
-    "//third_party/icu/icu4c/source/i18n",
-    "//third_party/icu/icu4c/source",
     "$ark_es2panda_root",
   ]
 }
@@ -1159,9 +1156,7 @@ ohos_source_set("libes2panda_frontend_static") {
     ":gen_es2panda_lexer_tokenType_h",
     ":gen_es2panda_lexer_token_inl",
     ":isa_gen_es2panda_formats_h",
-    ":isa_gen_es2panda_isa_h",
-    "$ark_third_party_root/icu/icu4c:static_icui18n",
-    "$ark_third_party_root/icu/icu4c:static_icuuc",
+    ":isa_gen_es2panda_isa_h"
   ]
   external_deps = [
     "runtime_core:libarktsassembler_package",
@@ -1169,6 +1164,8 @@ ohos_source_set("libes2panda_frontend_static") {
     "runtime_core:libarktscompiler_package",
     "runtime_core:libarktsfile_package",
     sdk_libc_secshared_dep,
+    "icu:static_icuuc",
+    "icu:static_icui18n"
   ]
   part_name = "ets_frontend"
   subsystem_name = "arkcompiler"
@@ -1219,6 +1216,7 @@ ohos_source_set("libes2panda_public_frontend_static") {
   external_deps = [
     "runtime_core:libarktsbytecodeopt_package",
     sdk_libc_secshared_dep,
+    "icu:static_icuuc",
   ]
   part_name = "ets_frontend"
   subsystem_name = "arkcompiler"
diff --git a/ets2panda/lsp/include/services/text_change/change_tracker.h b/ets2panda/lsp/include/services/text_change/change_tracker.h
index d7d6d1042b..ff21fa0cdb 100644
--- a/ets2panda/lsp/include/services/text_change/change_tracker.h
+++ b/ets2panda/lsp/include/services/text_change/change_tracker.h
@@ -29,7 +29,6 @@
 #include "lsp/include/formatting/formatting_context.h"
 #include "lsp/include/formatting/formatting.h"
 #include "lsp/include/internal_api.h"
-#include "util.h"
 #include "public/es2panda_lib.h"
 
 namespace ark::es2panda::lsp {
diff --git a/merge_abc/BUILD.gn b/merge_abc/BUILD.gn
index 54bdb3148c..6dd10e8922 100644
--- a/merge_abc/BUILD.gn
+++ b/merge_abc/BUILD.gn
@@ -207,12 +207,13 @@ ohos_executable("merge_abc") {
 
   deps = [
     ":panda_assembly_proto_static",
-    "$ark_third_party_root/icu/icu4c:static_icuuc",
     "../es2panda:es2panda_lib",
   ]
 
+  external_deps = [ "icu:static_icuuc" ]
+
   if (!is_arkui_x) {
-    external_deps = [ "runtime_core:libarkziparchive_frontend_static" ]
+    external_deps += [ "runtime_core:libarkziparchive_frontend_static" ]
   } else {
     deps += [ "$ark_root/libziparchive:libarkziparchive_frontend_static" ]
   }
-- 
Gitee