From e87f7518430590a71afa20ec4fe631cfd38f619d Mon Sep 17 00:00:00 2001 From: zhuzhihui7 Date: Fri, 20 Jun 2025 14:33:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=96=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ifa40d6e1feed7aa5007d791d1505d681da1299ee Signed-off-by: zhuzhihui7 --- bundle.json | 3 ++- es2panda/BUILD.gn | 10 ++++------ ets2panda/BUILD.gn | 5 ++--- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/bundle.json b/bundle.json index aaab390cf3..6e939e6247 100644 --- a/bundle.json +++ b/bundle.json @@ -22,7 +22,8 @@ "runtime_core", "zlib", "bounds_checking_function", - "protobuf" + "protobuf", + "icu" ], "third_party": [ "json", diff --git a/es2panda/BUILD.gn b/es2panda/BUILD.gn index d7f663a2bb..0ab48f7558 100644 --- a/es2panda/BUILD.gn +++ b/es2panda/BUILD.gn @@ -394,12 +394,7 @@ ohos_static_library("es2panda_lib") { "../merge_abc:panda_assembly_proto_public_config", ] - include_dirs = [ - "${target_out_dir}", - "//third_party/icu/icu4c/source/common", - "//third_party/icu/icu4c/source/i18n", - "//third_party/icu/icu4c/source", - ] + include_dirs = [ "${target_out_dir}" ] deps = [ ":gen_isa_headers", @@ -411,6 +406,7 @@ ohos_static_library("es2panda_lib") { external_deps = [] if (!is_arkui_x) { external_deps += [ + "icu:static_icuuc", "json:nlohmann_json_static", "runtime_core:abc2program_frontend_static", "runtime_core:libarkassembler_frontend_static", @@ -421,6 +417,7 @@ ohos_static_library("es2panda_lib") { if (enable_bytecode_optimizer) { external_deps += [ + "icu:static_icuuc", "runtime_core:libarkbytecodeopt_frontend_static", "runtime_core:libarkcompiler_frontend_static", ] @@ -443,6 +440,7 @@ ohos_static_library("es2panda_lib") { } if (ark_standalone_build) { external_deps += [ + "icu:static_icuuc", "protobuf:protobuf_lite_static", "protobuf:protobuf_static", ] diff --git a/ets2panda/BUILD.gn b/ets2panda/BUILD.gn index 7542df6a82..c5d73b82e2 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", ] } @@ -1146,6 +1143,7 @@ ohos_source_set("libes2panda_frontend_static") { "$ark_third_party_root/icu/icu4c:static_icuuc", ] external_deps = [ + "icu:static_icuuc", "runtime_core:libarktsassembler_package", "runtime_core:libarktsbase_package", "runtime_core:libarktscompiler_package", @@ -1199,6 +1197,7 @@ ohos_source_set("libes2panda_public_frontend_static") { } external_deps = [ + "icu:static_icuuc", "runtime_core:libarktsbytecodeopt_package", sdk_libc_secshared_dep, ] -- Gitee