diff --git a/bundle.json b/bundle.json index 5388af1ced553cc6f46dc1566bbfa38028a52ddb..3ab0189f0c60743faeb8545c92604fd25068cc7d 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 66e0360c9cdc30c3d920e49c01fd4278864d27f9..155c0f165eda9b0d5a0137dbebdfa6e5b5bac103 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",