From f2975fde5fe728e0e3a895386aa68f5831f2510a Mon Sep 17 00:00:00 2001 From: zhangdd_ewan Date: Mon, 18 Mar 2024 16:06:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=94=B9=E7=BC=96=E8=AF=91=E9=80=89?= =?UTF-8?q?=E9=A1=B9=E4=BD=BF=E7=94=A8=E5=85=A8=E9=87=8F=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangdd_ewan --- icu.gni | 1 + icu4c/BUILD.gn | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/icu.gni b/icu.gni index 62afc365..9a02425f 100644 --- a/icu.gni +++ b/icu.gni @@ -13,4 +13,5 @@ declare_args() { icu_support_locales = true + build_feature = normal } diff --git a/icu4c/BUILD.gn b/icu4c/BUILD.gn index 155c0f16..65f8c17b 100644 --- a/icu4c/BUILD.gn +++ b/icu4c/BUILD.gn @@ -57,7 +57,7 @@ ohos_static_library("static_icustubdata") { ohos_prebuilt_etc("ohos_icudat") { if ("${product_name}" == "ohcore") { source = "//third_party/icu/ohos_icu4j/data/icudt68l.dat" - } else if ("${product_name}" == "higeneric") { + } else if ("${build_feature}" == "anco") { source = "//third_party/icu/ohos_icu4j/data/lite/icudt72l.dat" } else if (icu_support_locales) { source = "//third_party/icu/ohos_icu4j/data/icudt72l.dat" From 53bc58d95ec4ed65e5df54b17b4701867d209155 Mon Sep 17 00:00:00 2001 From: zhangdd_ewan Date: Tue, 19 Mar 2024 09:53:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=94=B9=E7=BC=96=E8=AF=91=E9=80=89?= =?UTF-8?q?=E9=A1=B9=E4=BD=BF=E7=94=A8=E5=85=A8=E9=87=8F=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangdd_ewan --- icu.gni | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icu.gni b/icu.gni index 9a02425f..1828c345 100644 --- a/icu.gni +++ b/icu.gni @@ -13,5 +13,5 @@ declare_args() { icu_support_locales = true - build_feature = normal + build_feature = "normal" } From 6706ee1935a8910d2e5da1c2ccbafe9bd18b55a0 Mon Sep 17 00:00:00 2001 From: zhangdd_ewan Date: Tue, 19 Mar 2024 12:03:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=94=B9=E7=BC=96=E8=AF=91=E9=80=89?= =?UTF-8?q?=E9=A1=B9=E4=BD=BF=E7=94=A8=E5=85=A8=E9=87=8F=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangdd_ewan --- icu4c/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icu4c/BUILD.gn b/icu4c/BUILD.gn index 65f8c17b..bb092ced 100644 --- a/icu4c/BUILD.gn +++ b/icu4c/BUILD.gn @@ -57,7 +57,7 @@ ohos_static_library("static_icustubdata") { ohos_prebuilt_etc("ohos_icudat") { if ("${product_name}" == "ohcore") { source = "//third_party/icu/ohos_icu4j/data/icudt68l.dat" - } else if ("${build_feature}" == "anco") { + } else if ("${build_feature}" == "lite") { source = "//third_party/icu/ohos_icu4j/data/lite/icudt72l.dat" } else if (icu_support_locales) { source = "//third_party/icu/ohos_icu4j/data/icudt72l.dat"