From a921dd5f68c720c1c65c7bbd40714e4e10e5030c Mon Sep 17 00:00:00 2001
From: zhoujunquan <junquan.zhou@huawei.com>
Date: Fri, 9 Apr 2021 10:50:33 +0800
Subject: [PATCH] update icu4c/BUILD.gn.

---
 icu4c/BUILD.gn | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/icu4c/BUILD.gn b/icu4c/BUILD.gn
index a8dacc23..1edeaf1d 100755
--- a/icu4c/BUILD.gn
+++ b/icu4c/BUILD.gn
@@ -36,12 +36,18 @@ ohos_static_library("static_icustubdata") {
     "-Wpointer-arith",
     "-Wwrite-strings",
     "-std=c++11",
-    "-Wno-ignored-attributes",
   ]
   output_dir = "${root_out_dir}/third_party/icu/stubdata"
   output_name = "stubdata"
 }
 
+ohos_prebuilt_etc("ohos_icudat") {
+  source = "//third_party/icu/ohos_icu4j/data/icudt67l.dat"
+  module_install_dir = "usr/ohos_icu/"
+  part_name = "i18n_L2"
+  subsystem_name = "global"
+}
+
 icu_common_source = [
   "//third_party/icu/icu4c/source/common/ubiditransform.cpp",
   "//third_party/icu/icu4c/source/common/locutil.cpp",
@@ -489,7 +495,6 @@ ohos_shared_library("shared_icuuc") {
     "U_COMMON_IMPLEMENTATION",
     "UPRV_BLOCK_MACRO_BEGIN=",
     "UPRV_BLOCK_MACRO_END=",
-    "UCONFIG_USE_WINDOWS_LCID_MAPPING_API=0",
     "_REENTRANT",
   ]
   sources = icu_common_source
@@ -504,14 +509,19 @@ ohos_shared_library("shared_icuuc") {
     "-Wno-error=unused-const-variable",
     "-Wno-error=unneeded-internal-declaration",
     "-std=c++11",
-    "-Wno-ignored-attributes",
   ]
   ldflags = [
     "-shared",
+    "-ldl",
     "-lm",
   ]
-  subsystem_name = "global"
-  part_name = "i18n"
+  if (is_standard_system) {
+    part_name = "i18n_L2"
+    subsystem_name = "global"
+  } else {
+    part_name = "i18n"
+    subsystem_name = "global"
+  }
   output_name = "hmicuuc"
   install_enable = true
 }
@@ -543,15 +553,19 @@ ohos_shared_library("shared_icui18n") {
     "-Wno-error=unneeded-internal-declaration",
     "-Wwrite-strings",
     "-std=c++11",
-    "-Wno-ignored-attributes",
   ]
   ldflags = [
     "-shared",
     "-ldl",
     "-lm",
   ]
-  subsystem_name = "global"
-  part_name = "i18n"
+  if (is_standard_system) {
+    part_name = "i18n_L2"
+    subsystem_name = "global"
+  } else {
+    part_name = "i18n"
+    subsystem_name = "global"
+  }
   output_name = "hmicui18n"
   install_enable = true
 }
@@ -568,7 +582,6 @@ ohos_static_library("static_icuuc") {
     "U_STATIC_IMPLEMENTATION",
     "UPRV_BLOCK_MACRO_BEGIN=",
     "UPRV_BLOCK_MACRO_END=",
-    "UCONFIG_USE_WINDOWS_LCID_MAPPING_API=0",
     "_REENTRANT",
   ]
   sources = icu_common_source
@@ -585,8 +598,7 @@ ohos_static_library("static_icuuc") {
     "-Wno-error=unneeded-internal-declaration",
     "-fvisibility-inlines-hidden",
     "-Wno-unused-function",
-    "-Wno-ignored-attributes",
-  ]
+    ]
 
   cflags = [
     "-fvisibility=hidden",
@@ -636,7 +648,6 @@ ohos_static_library("static_icui18n") {
     "-std=c++11",
     "-fvisibility-inlines-hidden",
     "-fno-exceptions",
-    "-Wno-ignored-attributes",
   ]
 
   cflags = [
@@ -652,4 +663,4 @@ ohos_static_library("static_icui18n") {
     "-lm",
   ]
   output_name = "hmicui18n"
-}
+}
\ No newline at end of file
-- 
Gitee