From 65c02c650f3f8729e6d4ca04bc3514667d5bb870 Mon Sep 17 00:00:00 2001 From: openharmony_ci <120357966@qq.com> Date: Wed, 6 Mar 2024 03:04:02 +0000 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!630=20:?= =?UTF-8?q?=20=E6=8F=90=E4=BE=9Bicu=20ndk=E6=8E=A5=E5=8F=A3'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bundle.json | 2 +- frameworks/intl/BUILD.gn | 11 +++++++---- frameworks/intl/include/collator.h | 2 +- frameworks/intl/include/entity_recognizer.h | 2 +- frameworks/intl/include/i18n_break_iterator.h | 2 +- frameworks/intl/include/i18n_calendar.h | 4 ++-- frameworks/intl/include/i18n_normalizer.h | 2 +- frameworks/intl/include/utils.h | 2 +- frameworks/intl/src/character.cpp | 4 ++-- frameworks/intl/src/collator.cpp | 8 ++++---- frameworks/intl/src/i18n_break_iterator.cpp | 4 ++-- frameworks/intl/src/i18n_calendar.cpp | 10 +++++----- frameworks/intl/src/i18n_timezone.cpp | 4 ++-- frameworks/intl/src/index_util.cpp | 6 +++--- frameworks/intl/src/locale_config.cpp | 10 +++++----- frameworks/intl/src/phone_number_format.cpp | 4 ++-- frameworks/intl/src/plural_rules.cpp | 6 +++--- frameworks/intl/test/BUILD.gn | 7 +++++-- .../test/fuzztest/breakiterator_fuzzer/BUILD.gn | 15 +++++++++------ .../intl/test/fuzztest/calendar_fuzzer/BUILD.gn | 15 +++++++++------ .../fuzztest/calendar_fuzzer/calendar_fuzzer.cpp | 2 +- .../intl/test/fuzztest/character_fuzzer/BUILD.gn | 15 +++++++++------ .../intl/test/fuzztest/collator_fuzzer/BUILD.gn | 15 +++++++++------ .../test/fuzztest/datetimefilter_fuzzer/BUILD.gn | 9 ++++----- .../test/fuzztest/datetimeformat_fuzzer/BUILD.gn | 15 +++++++++------ .../test/fuzztest/datetimerule_fuzzer/BUILD.gn | 9 ++++----- .../fuzztest/entityrecongnizer_fuzzer/BUILD.gn | 9 ++++----- .../test/fuzztest/holidaymanager_fuzzer/BUILD.gn | 15 +++++++++------ .../intl/test/fuzztest/indexutil_fuzzer/BUILD.gn | 15 +++++++++------ .../test/fuzztest/localecompare_fuzzer/BUILD.gn | 15 +++++++++------ .../fuzztest/localeconfigget_fuzzer/BUILD.gn | 15 +++++++++------ .../fuzztest/localeconfigset_fuzzer/BUILD.gn | 15 +++++++++------ .../test/fuzztest/localeinfo_fuzzer/BUILD.gn | 15 +++++++++------ .../test/fuzztest/measuredata_fuzzer/BUILD.gn | 15 +++++++++------ .../test/fuzztest/normalizer_fuzzer/BUILD.gn | 15 +++++++++------ .../test/fuzztest/numberformat_fuzzer/BUILD.gn | 15 +++++++++------ .../fuzztest/phonenumberformat_fuzzer/BUILD.gn | 11 ++++++----- .../fuzztest/phonenumbermatched_fuzzer/BUILD.gn | 9 ++++----- .../test/fuzztest/pluralrules_fuzzer/BUILD.gn | 15 +++++++++------ .../fuzztest/preferredlanguage_fuzzer/BUILD.gn | 11 ++++++----- .../intl/test/fuzztest/regexrule_fuzzer/BUILD.gn | 9 ++++----- .../fuzztest/relativetimeformat_fuzzer/BUILD.gn | 15 +++++++++------ .../test/fuzztest/rulesengine_fuzzer/BUILD.gn | 13 +++++++------ .../fuzztest/systemlocalemanager_fuzzer/BUILD.gn | 15 +++++++++------ .../intl/test/fuzztest/taboo_fuzzer/BUILD.gn | 15 +++++++++------ .../intl/test/fuzztest/timezone_fuzzer/BUILD.gn | 13 +++++++------ .../intl/test/fuzztest/utils_fuzzer/BUILD.gn | 15 +++++++++------ .../intl/test/unittest/locale_config_test.cpp | 2 +- frameworks/zone/BUILD.gn | 14 ++++++++------ frameworks/zone/src/zone_util.cpp | 2 +- frameworks/zone/test/BUILD.gn | 2 ++ interfaces/js/kits/BUILD.gn | 16 ++++++++++++---- .../js/kits/src/entity_recognizer_addon.cpp | 2 +- .../native/inner_api/zone/include/zone_util.h | 2 +- services/test/BUILD.gn | 3 +++ 55 files changed, 295 insertions(+), 218 deletions(-) diff --git a/bundle.json b/bundle.json index d3909616..b30fcc23 100644 --- a/bundle.json +++ b/bundle.json @@ -59,7 +59,6 @@ "c_utils", "eventhandler", "hilog", - "icu", "init", "ipc", "napi", @@ -69,6 +68,7 @@ "samgr" ], "third_party": [ + "icu", "libphonenumber", "libpng", "libxml2" diff --git a/frameworks/intl/BUILD.gn b/frameworks/intl/BUILD.gn index 907e18b6..33fa9cdc 100644 --- a/frameworks/intl/BUILD.gn +++ b/frameworks/intl/BUILD.gn @@ -69,6 +69,10 @@ ohos_shared_library("preferred_language") { config("intl_util_config") { include_dirs = [ + "//third_party/icu/icu4c/source", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", + "//third_party/icu/icu4c/source/common/unicode", "//base/global/i18n/frameworks/intl/include", "//base/global/i18n/interfaces/native/inner_api/i18n/include", ] @@ -151,6 +155,9 @@ ohos_shared_library("intl_util") { ":zh_Hans_region_xml", ":zh_Hans_timezone_xml", ":zh_datetime_xml", + "//third_party/icu/icu4c:ohos_icudat", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", "//third_party/libphonenumber/cpp:phonenumber_standard", "//third_party/libpng:libpng", "//third_party/libxml2:xml2", @@ -163,10 +170,6 @@ ohos_shared_library("intl_util") { "access_token:libtokenid_sdk", "c_utils:utils", "hilog:libhilog", - "icu:icundk", - "icu:ohos_icudat", - "icu:shared_icui18n", - "icu:shared_icuuc", "init:libbegetutil", "ipc:ipc_core", ] diff --git a/frameworks/intl/include/collator.h b/frameworks/intl/include/collator.h index 054641bf..3d835b4c 100644 --- a/frameworks/intl/include/collator.h +++ b/frameworks/intl/include/collator.h @@ -24,7 +24,7 @@ #include "memory" #include "unicode/coll.h" #include "unicode/locid.h" -#include "unicode/utypes.h" +#include "utypes.h" namespace OHOS { namespace Global { diff --git a/frameworks/intl/include/entity_recognizer.h b/frameworks/intl/include/entity_recognizer.h index cf7dad57..67e15526 100644 --- a/frameworks/intl/include/entity_recognizer.h +++ b/frameworks/intl/include/entity_recognizer.h @@ -15,7 +15,7 @@ #ifndef OHOS_GLOBAL_I18N_ENTITY_RECOGNIZER_H #define OHOS_GLOBAL_I18N_ENTITY_RECOGNIZER_H -#include +#include #include #include #include "date_time_matched.h" diff --git a/frameworks/intl/include/i18n_break_iterator.h b/frameworks/intl/include/i18n_break_iterator.h index 8b13c51c..2f0e20b1 100644 --- a/frameworks/intl/include/i18n_break_iterator.h +++ b/frameworks/intl/include/i18n_break_iterator.h @@ -19,7 +19,7 @@ #include "iosfwd" #include "unicode/brkiter.h" -#include "unicode/unistr.h" +#include "unistr.h" namespace OHOS { namespace Global { diff --git a/frameworks/intl/include/i18n_calendar.h b/frameworks/intl/include/i18n_calendar.h index 1b1023ee..f58dc9c6 100644 --- a/frameworks/intl/include/i18n_calendar.h +++ b/frameworks/intl/include/i18n_calendar.h @@ -19,10 +19,10 @@ #include #include "iosfwd" -#include "unicode/locid.h" +#include "locid.h" #include "unicode/calendar.h" #include "unicode/ucal.h" -#include "unicode/utypes.h" +#include "utypes.h" namespace OHOS { namespace Global { diff --git a/frameworks/intl/include/i18n_normalizer.h b/frameworks/intl/include/i18n_normalizer.h index cf43cb01..af613ff6 100644 --- a/frameworks/intl/include/i18n_normalizer.h +++ b/frameworks/intl/include/i18n_normalizer.h @@ -17,7 +17,7 @@ #define OHOS_GLOBAL_I18N_I18N_NORMALIZER_H #include "i18n_types.h" -#include "unicode/normalizer2.h" +#include "normalizer2.h" namespace OHOS { namespace Global { diff --git a/frameworks/intl/include/utils.h b/frameworks/intl/include/utils.h index 42327c4d..7b219e67 100644 --- a/frameworks/intl/include/utils.h +++ b/frameworks/intl/include/utils.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include namespace OHOS { namespace Global { diff --git a/frameworks/intl/src/character.cpp b/frameworks/intl/src/character.cpp index 9cc8b7e3..0c9ccd9c 100644 --- a/frameworks/intl/src/character.cpp +++ b/frameworks/intl/src/character.cpp @@ -21,9 +21,9 @@ #include "cctype" #include "map" #include "string" -#include "unicode/umachine.h" +#include "umachine.h" #include "unicode/unistr.h" -#include "unicode/urename.h" +#include "urename.h" namespace OHOS { namespace Global { diff --git a/frameworks/intl/src/collator.cpp b/frameworks/intl/src/collator.cpp index 93821a29..4a026211 100644 --- a/frameworks/intl/src/collator.cpp +++ b/frameworks/intl/src/collator.cpp @@ -14,19 +14,19 @@ */ #include "collator.h" -#include +#include #include "locale_config.h" #include "map" #include "set" -#include "unicode/strenum.h" +#include "strenum.h" #include "string" #include "unicode/errorcode.h" #include "unicode/locid.h" #include "unicode/ucol.h" #include "unicode/uloc.h" -#include "unicode/unistr.h" -#include "unicode/urename.h" +#include "unistr.h" +#include "urename.h" #include "utility" #include "vector" diff --git a/frameworks/intl/src/i18n_break_iterator.cpp b/frameworks/intl/src/i18n_break_iterator.cpp index 7e762beb..23e6cfe6 100644 --- a/frameworks/intl/src/i18n_break_iterator.cpp +++ b/frameworks/intl/src/i18n_break_iterator.cpp @@ -14,9 +14,9 @@ */ #include "i18n_break_iterator.h" -#include "unicode/brkiter.h" +#include "brkiter.h" #include "string" -#include "unicode/utypes.h" +#include "utypes.h" namespace OHOS { namespace Global { diff --git a/frameworks/intl/src/i18n_calendar.cpp b/frameworks/intl/src/i18n_calendar.cpp index 6094f1a0..78f6ab43 100644 --- a/frameworks/intl/src/i18n_calendar.cpp +++ b/frameworks/intl/src/i18n_calendar.cpp @@ -22,18 +22,18 @@ #include "indiancal.h" #include "islamcal.h" #include "japancal.h" -#include "unicode/locdspnm.h" +#include "locdspnm.h" #include "persncal.h" #include "string" #include "ureslocs.h" #include "ulocimp.h" -#include "unicode/umachine.h" +#include "umachine.h" #include "unicode/gregocal.h" #include "unicode/timezone.h" -#include "unicode/unistr.h" -#include "unicode/urename.h" +#include "unistr.h" +#include "urename.h" #include "ustr_imp.h" -#include "unicode/ustring.h" +#include "ustring.h" namespace OHOS { namespace Global { diff --git a/frameworks/intl/src/i18n_timezone.cpp b/frameworks/intl/src/i18n_timezone.cpp index 31b2c372..ef05d5ce 100644 --- a/frameworks/intl/src/i18n_timezone.cpp +++ b/frameworks/intl/src/i18n_timezone.cpp @@ -29,10 +29,10 @@ #include "set" #include "string" #include "type_traits" -#include "unicode/umachine.h" +#include "umachine.h" #include "utility" #include "utils.h" -#include "unicode/utypes.h" +#include "utypes.h" #include "vector" #include "unicode/locid.h" #include "unicode/unistr.h" diff --git a/frameworks/intl/src/index_util.cpp b/frameworks/intl/src/index_util.cpp index e211b191..96054304 100644 --- a/frameworks/intl/src/index_util.cpp +++ b/frameworks/intl/src/index_util.cpp @@ -15,10 +15,10 @@ #include "index_util.h" #include "locale_config.h" -#include "unicode/locid.h" +#include "locid.h" #include "string" -#include "unicode/unistr.h" -#include "unicode/utypes.h" +#include "unistr.h" +#include "utypes.h" #include "vector" namespace OHOS { diff --git a/frameworks/intl/src/locale_config.cpp b/frameworks/intl/src/locale_config.cpp index f1cba40c..b17189ec 100644 --- a/frameworks/intl/src/locale_config.cpp +++ b/frameworks/intl/src/locale_config.cpp @@ -26,18 +26,18 @@ #include "ipc_skeleton.h" #include "libxml/parser.h" #include "locale_info.h" -#include "unicode/localebuilder.h" -#include "unicode/locdspnm.h" -#include "unicode/locid.h" +#include "localebuilder.h" +#include "locdspnm.h" +#include "locid.h" #include "ohos/init_data.h" #include "parameter.h" #include "securec.h" #include "string_ex.h" #include "ucase.h" #include "ulocimp.h" -#include "unicode/unistr.h" +#include "unistr.h" #include "ureslocs.h" -#include "unicode/ustring.h" +#include "ustring.h" #include "ustr_imp.h" #include "utils.h" #include "tokenid_kit.h" diff --git a/frameworks/intl/src/phone_number_format.cpp b/frameworks/intl/src/phone_number_format.cpp index c0425f3a..44725f72 100644 --- a/frameworks/intl/src/phone_number_format.cpp +++ b/frameworks/intl/src/phone_number_format.cpp @@ -16,9 +16,9 @@ #include -#include "unicode/localebuilder.h" +#include "localebuilder.h" #include "locale_config.h" -#include "unicode/locid.h" +#include "locid.h" #include "hilog/log.h" #include "map" #include "new" diff --git a/frameworks/intl/src/plural_rules.cpp b/frameworks/intl/src/plural_rules.cpp index c97fb124..91d5145b 100644 --- a/frameworks/intl/src/plural_rules.cpp +++ b/frameworks/intl/src/plural_rules.cpp @@ -14,13 +14,13 @@ */ #include "plural_rules.h" -#include +#include #include "algorithm" #include "hilog/log_c.h" #include "hilog/log_cpp.h" #include "locale_config.h" -#include "unicode/locid.h" +#include "locid.h" #include "plural_rules.h" #include "map" #include "set" @@ -29,7 +29,7 @@ #include "unicode/upluralrules.h" #include "utility" #include "utils.h" -#include "unicode/utypes.h" +#include "utypes.h" #include "vector" namespace OHOS { diff --git a/frameworks/intl/test/BUILD.gn b/frameworks/intl/test/BUILD.gn index 3459364e..f43dfbf4 100644 --- a/frameworks/intl/test/BUILD.gn +++ b/frameworks/intl/test/BUILD.gn @@ -32,6 +32,9 @@ ohos_unittest("intl_test") { "//base/global/i18n/interfaces/native/inner_api/i18n/include", "//base/global/i18n/interfaces/native/inner_api/preferred_language/include", "//base/global/i18n/services/include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/common/unicode", + "//third_party/icu/icu4c/source/i18n", "//third_party/libphonenumber/cpp/src", "//third_party/libphonenumber", "//third_party/protobuf/src", @@ -41,8 +44,6 @@ ohos_unittest("intl_test") { "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", - "icu:shared_icui18n", - "icu:shared_icuuc", "init:libbegetutil", ] @@ -50,6 +51,8 @@ ohos_unittest("intl_test") { "//base/global/i18n/frameworks/intl:build_module", "//base/global/i18n/services:i18n_service_ability", "//third_party/googletest:gtest_main", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", "//third_party/libphonenumber/cpp:phonenumber_standard", "//third_party/libpng:libpng", ] diff --git a/frameworks/intl/test/fuzztest/breakiterator_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/breakiterator_fuzzer/BUILD.gn index 2c4d74ad..910b1141 100644 --- a/frameworks/intl/test/fuzztest/breakiterator_fuzzer/BUILD.gn +++ b/frameworks/intl/test/fuzztest/breakiterator_fuzzer/BUILD.gn @@ -25,7 +25,11 @@ ohos_fuzztest("BreakIteratorFuzzTest") { fuzz_config_file = "//base/global/i18n/frameworks/intl/test/fuzztest/breakiterator_fuzzer" - include_dirs = [ "//base/global/i18n/frameworks/intl/include" ] + include_dirs = [ + "//base/global/i18n/frameworks/intl/include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", + ] cflags = [ "-g", "-O0", @@ -35,11 +39,10 @@ ohos_fuzztest("BreakIteratorFuzzTest") { sources = [ "breakiterator_fuzzer.cpp" ] configs = [] - deps = [ "//base/global/i18n/frameworks/intl:intl_util" ] - - external_deps = [ - "icu:shared_icui18n", - "icu:shared_icuuc", + deps = [ + "//base/global/i18n/frameworks/intl:intl_util", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", ] subsystem_name = "global" diff --git a/frameworks/intl/test/fuzztest/calendar_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/calendar_fuzzer/BUILD.gn index 39f0ea24..cb841266 100644 --- a/frameworks/intl/test/fuzztest/calendar_fuzzer/BUILD.gn +++ b/frameworks/intl/test/fuzztest/calendar_fuzzer/BUILD.gn @@ -24,7 +24,11 @@ ohos_fuzztest("CalendarFuzzTest") { fuzz_config_file = "." - include_dirs = [ "../../../include" ] + include_dirs = [ + "../../../include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", + ] cflags = [ "-g", "-O0", @@ -34,11 +38,10 @@ ohos_fuzztest("CalendarFuzzTest") { sources = [ "calendar_fuzzer.cpp" ] configs = [] - deps = [ "../../../../intl:intl_util" ] - - external_deps = [ - "icu:shared_icui18n", - "icu:shared_icuuc", + deps = [ + "../../../../intl:intl_util", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", ] subsystem_name = "global" diff --git a/frameworks/intl/test/fuzztest/calendar_fuzzer/calendar_fuzzer.cpp b/frameworks/intl/test/fuzztest/calendar_fuzzer/calendar_fuzzer.cpp index 21c36326..eeef4ce2 100644 --- a/frameworks/intl/test/fuzztest/calendar_fuzzer/calendar_fuzzer.cpp +++ b/frameworks/intl/test/fuzztest/calendar_fuzzer/calendar_fuzzer.cpp @@ -19,7 +19,7 @@ #include "i18n_calendar.h" #include "calendar_fuzzer.h" #include "unicode/ucal.h" -#include "unicode/utypes.h" +#include "utypes.h" namespace OHOS { bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size) diff --git a/frameworks/intl/test/fuzztest/character_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/character_fuzzer/BUILD.gn index 522f5dc4..6d8e6261 100644 --- a/frameworks/intl/test/fuzztest/character_fuzzer/BUILD.gn +++ b/frameworks/intl/test/fuzztest/character_fuzzer/BUILD.gn @@ -25,7 +25,11 @@ ohos_fuzztest("CharacterFuzzTest") { fuzz_config_file = "//base/global/i18n/frameworks/intl/test/fuzztest/character_fuzzer" - include_dirs = [ "//base/global/i18n/frameworks/intl/include" ] + include_dirs = [ + "//base/global/i18n/frameworks/intl/include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", + ] cflags = [ "-g", "-O0", @@ -35,11 +39,10 @@ ohos_fuzztest("CharacterFuzzTest") { sources = [ "character_fuzzer.cpp" ] configs = [] - deps = [ "//base/global/i18n/frameworks/intl:intl_util" ] - - external_deps = [ - "icu:shared_icui18n", - "icu:shared_icuuc", + deps = [ + "//base/global/i18n/frameworks/intl:intl_util", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", ] subsystem_name = "global" diff --git a/frameworks/intl/test/fuzztest/collator_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/collator_fuzzer/BUILD.gn index fc467ade..42f32dd9 100644 --- a/frameworks/intl/test/fuzztest/collator_fuzzer/BUILD.gn +++ b/frameworks/intl/test/fuzztest/collator_fuzzer/BUILD.gn @@ -25,7 +25,11 @@ ohos_fuzztest("CollatorFuzzTest") { fuzz_config_file = "//base/global/i18n/frameworks/intl/test/fuzztest/collator_fuzzer" - include_dirs = [ "//base/global/i18n/frameworks/intl/include" ] + include_dirs = [ + "//base/global/i18n/frameworks/intl/include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", + ] cflags = [ "-g", "-O0", @@ -37,11 +41,10 @@ ohos_fuzztest("CollatorFuzzTest") { configs = [] - deps = [ "//base/global/i18n/frameworks/intl:intl_util" ] - - external_deps = [ - "icu:shared_icui18n", - "icu:shared_icuuc", + deps = [ + "//base/global/i18n/frameworks/intl:intl_util", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", ] subsystem_name = "global" diff --git a/frameworks/intl/test/fuzztest/datetimefilter_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/datetimefilter_fuzzer/BUILD.gn index efeade45..5a7fdad7 100644 --- a/frameworks/intl/test/fuzztest/datetimefilter_fuzzer/BUILD.gn +++ b/frameworks/intl/test/fuzztest/datetimefilter_fuzzer/BUILD.gn @@ -26,6 +26,8 @@ ohos_fuzztest("DateTimeFilterFuzzTest") { include_dirs = [ "../../../include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", "//third_party/libphonenumber/cpp/src", "//third_party/libphonenumber", "//third_party/protobuf/src", @@ -41,15 +43,12 @@ ohos_fuzztest("DateTimeFilterFuzzTest") { deps = [ "../../../../intl:intl_util", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", "//third_party/libphonenumber/cpp:phonenumber_standard", "//third_party/libxml2:xml2", ] - external_deps = [ - "icu:shared_icui18n", - "icu:shared_icuuc", - ] - subsystem_name = "global" part_name = "i18n" } diff --git a/frameworks/intl/test/fuzztest/datetimeformat_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/datetimeformat_fuzzer/BUILD.gn index 6064176a..ee91adf6 100644 --- a/frameworks/intl/test/fuzztest/datetimeformat_fuzzer/BUILD.gn +++ b/frameworks/intl/test/fuzztest/datetimeformat_fuzzer/BUILD.gn @@ -24,7 +24,11 @@ ohos_fuzztest("DateTimeFormatFuzzTest") { fuzz_config_file = "." - include_dirs = [ "../../../include" ] + include_dirs = [ + "../../../include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", + ] cflags = [ "-g", "-O0", @@ -34,11 +38,10 @@ ohos_fuzztest("DateTimeFormatFuzzTest") { sources = [ "datetimeformat_fuzzer.cpp" ] configs = [] - deps = [ "../../../../intl:intl_util" ] - - external_deps = [ - "icu:shared_icui18n", - "icu:shared_icuuc", + deps = [ + "../../../../intl:intl_util", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", ] subsystem_name = "global" diff --git a/frameworks/intl/test/fuzztest/datetimerule_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/datetimerule_fuzzer/BUILD.gn index 0a57eff5..29420aa8 100644 --- a/frameworks/intl/test/fuzztest/datetimerule_fuzzer/BUILD.gn +++ b/frameworks/intl/test/fuzztest/datetimerule_fuzzer/BUILD.gn @@ -26,6 +26,8 @@ ohos_fuzztest("DateTimeRuleFuzzTest") { include_dirs = [ "../../../include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", "//third_party/libphonenumber/cpp/src", "//third_party/libphonenumber", "//third_party/protobuf/src", @@ -41,15 +43,12 @@ ohos_fuzztest("DateTimeRuleFuzzTest") { deps = [ "../../../../intl:intl_util", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", "//third_party/libphonenumber/cpp:phonenumber_standard", "//third_party/libxml2:xml2", ] - external_deps = [ - "icu:shared_icui18n", - "icu:shared_icuuc", - ] - subsystem_name = "global" part_name = "i18n" } diff --git a/frameworks/intl/test/fuzztest/entityrecongnizer_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/entityrecongnizer_fuzzer/BUILD.gn index 33c7172f..5353d5ad 100644 --- a/frameworks/intl/test/fuzztest/entityrecongnizer_fuzzer/BUILD.gn +++ b/frameworks/intl/test/fuzztest/entityrecongnizer_fuzzer/BUILD.gn @@ -26,6 +26,8 @@ ohos_fuzztest("EntityRecongnizerFuzzTest") { include_dirs = [ "../../../include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", "//third_party/libphonenumber/cpp/src", "//third_party/libphonenumber", "//third_party/protobuf/src", @@ -41,15 +43,12 @@ ohos_fuzztest("EntityRecongnizerFuzzTest") { deps = [ "../../../../intl:intl_util", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", "//third_party/libphonenumber/cpp:phonenumber_standard", "//third_party/libxml2:xml2", ] - external_deps = [ - "icu:shared_icui18n", - "icu:shared_icuuc", - ] - subsystem_name = "global" part_name = "i18n" } diff --git a/frameworks/intl/test/fuzztest/holidaymanager_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/holidaymanager_fuzzer/BUILD.gn index 7330a49c..f33d17fb 100644 --- a/frameworks/intl/test/fuzztest/holidaymanager_fuzzer/BUILD.gn +++ b/frameworks/intl/test/fuzztest/holidaymanager_fuzzer/BUILD.gn @@ -24,7 +24,11 @@ ohos_fuzztest("HolidayManagerFuzzTest") { fuzz_config_file = "." - include_dirs = [ "../../../include" ] + include_dirs = [ + "../../../include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", + ] cflags = [ "-g", "-O0", @@ -34,11 +38,10 @@ ohos_fuzztest("HolidayManagerFuzzTest") { sources = [ "holidaymanager_fuzzer.cpp" ] configs = [] - deps = [ "../../../../intl:intl_util" ] - - external_deps = [ - "icu:shared_icui18n", - "icu:shared_icuuc", + deps = [ + "../../../../intl:intl_util", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", ] subsystem_name = "global" diff --git a/frameworks/intl/test/fuzztest/indexutil_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/indexutil_fuzzer/BUILD.gn index 21bcd24f..41413e70 100644 --- a/frameworks/intl/test/fuzztest/indexutil_fuzzer/BUILD.gn +++ b/frameworks/intl/test/fuzztest/indexutil_fuzzer/BUILD.gn @@ -24,7 +24,11 @@ ohos_fuzztest("IndexUtilFuzzTest") { fuzz_config_file = "." - include_dirs = [ "../../../include" ] + include_dirs = [ + "../../../include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", + ] cflags = [ "-g", "-O0", @@ -34,11 +38,10 @@ ohos_fuzztest("IndexUtilFuzzTest") { sources = [ "indexutil_fuzzer.cpp" ] configs = [] - deps = [ "../../../../intl:intl_util" ] - - external_deps = [ - "icu:shared_icui18n", - "icu:shared_icuuc", + deps = [ + "../../../../intl:intl_util", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", ] subsystem_name = "global" diff --git a/frameworks/intl/test/fuzztest/localecompare_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/localecompare_fuzzer/BUILD.gn index 0e673e5f..e031c7d0 100644 --- a/frameworks/intl/test/fuzztest/localecompare_fuzzer/BUILD.gn +++ b/frameworks/intl/test/fuzztest/localecompare_fuzzer/BUILD.gn @@ -24,7 +24,11 @@ ohos_fuzztest("LocaleCompareFuzzTest") { fuzz_config_file = "." - include_dirs = [ "../../../include" ] + include_dirs = [ + "../../../include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", + ] cflags = [ "-g", "-O0", @@ -34,11 +38,10 @@ ohos_fuzztest("LocaleCompareFuzzTest") { sources = [ "localecompare_fuzzer.cpp" ] configs = [] - deps = [ "../../../../intl:intl_util" ] - - external_deps = [ - "icu:shared_icui18n", - "icu:shared_icuuc", + deps = [ + "../../../../intl:intl_util", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", ] subsystem_name = "global" diff --git a/frameworks/intl/test/fuzztest/localeconfigget_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/localeconfigget_fuzzer/BUILD.gn index f0e7fe80..d42b98a4 100644 --- a/frameworks/intl/test/fuzztest/localeconfigget_fuzzer/BUILD.gn +++ b/frameworks/intl/test/fuzztest/localeconfigget_fuzzer/BUILD.gn @@ -25,7 +25,11 @@ ohos_fuzztest("LocaleConfigGetFuzzTest") { fuzz_config_file = "//base/global/i18n/frameworks/intl/test/fuzztest/localeconfigget_fuzzer" - include_dirs = [ "//base/global/i18n/frameworks/intl/include" ] + include_dirs = [ + "//base/global/i18n/frameworks/intl/include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", + ] cflags = [ "-g", "-O0", @@ -35,11 +39,10 @@ ohos_fuzztest("LocaleConfigGetFuzzTest") { sources = [ "localeconfigget_fuzzer.cpp" ] configs = [] - deps = [ "//base/global/i18n/frameworks/intl:intl_util" ] - - external_deps = [ - "icu:shared_icui18n", - "icu:shared_icuuc", + deps = [ + "//base/global/i18n/frameworks/intl:intl_util", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", ] subsystem_name = "global" diff --git a/frameworks/intl/test/fuzztest/localeconfigset_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/localeconfigset_fuzzer/BUILD.gn index 8581f7b8..d5595bf7 100644 --- a/frameworks/intl/test/fuzztest/localeconfigset_fuzzer/BUILD.gn +++ b/frameworks/intl/test/fuzztest/localeconfigset_fuzzer/BUILD.gn @@ -24,7 +24,11 @@ ohos_fuzztest("LocaleConfigSetFuzzTest") { fuzz_config_file = "." - include_dirs = [ "../../../include" ] + include_dirs = [ + "../../../include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", + ] cflags = [ "-g", "-O0", @@ -34,11 +38,10 @@ ohos_fuzztest("LocaleConfigSetFuzzTest") { sources = [ "localeconfigset_fuzzer.cpp" ] configs = [] - deps = [ "../../../../intl:intl_util" ] - - external_deps = [ - "icu:shared_icui18n", - "icu:shared_icuuc", + deps = [ + "../../../../intl:intl_util", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", ] subsystem_name = "global" diff --git a/frameworks/intl/test/fuzztest/localeinfo_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/localeinfo_fuzzer/BUILD.gn index da850548..ba12b429 100644 --- a/frameworks/intl/test/fuzztest/localeinfo_fuzzer/BUILD.gn +++ b/frameworks/intl/test/fuzztest/localeinfo_fuzzer/BUILD.gn @@ -25,7 +25,11 @@ ohos_fuzztest("LocaleInfoFuzzTest") { fuzz_config_file = "//base/global/i18n/frameworks/intl/test/fuzztest/localeinfo_fuzzer" - include_dirs = [ "//base/global/i18n/frameworks/intl/include" ] + include_dirs = [ + "//base/global/i18n/frameworks/intl/include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", + ] cflags = [ "-g", "-O0", @@ -35,11 +39,10 @@ ohos_fuzztest("LocaleInfoFuzzTest") { sources = [ "localeinfo_fuzzer.cpp" ] configs = [] - deps = [ "//base/global/i18n/frameworks/intl:intl_util" ] - - external_deps = [ - "icu:shared_icui18n", - "icu:shared_icuuc", + deps = [ + "//base/global/i18n/frameworks/intl:intl_util", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", ] subsystem_name = "global" diff --git a/frameworks/intl/test/fuzztest/measuredata_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/measuredata_fuzzer/BUILD.gn index 82d82ead..f4bd9cb5 100644 --- a/frameworks/intl/test/fuzztest/measuredata_fuzzer/BUILD.gn +++ b/frameworks/intl/test/fuzztest/measuredata_fuzzer/BUILD.gn @@ -25,7 +25,11 @@ ohos_fuzztest("MeasureDataFuzzTest") { fuzz_config_file = "//base/global/i18n/frameworks/intl/test/fuzztest/measuredata_fuzzer" - include_dirs = [ "//base/global/i18n/frameworks/intl/include" ] + include_dirs = [ + "//base/global/i18n/frameworks/intl/include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", + ] cflags = [ "-g", "-O0", @@ -35,11 +39,10 @@ ohos_fuzztest("MeasureDataFuzzTest") { sources = [ "measuredata_fuzzer.cpp" ] configs = [] - deps = [ "//base/global/i18n/frameworks/intl:intl_util" ] - - external_deps = [ - "icu:shared_icui18n", - "icu:shared_icuuc", + deps = [ + "//base/global/i18n/frameworks/intl:intl_util", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", ] subsystem_name = "global" diff --git a/frameworks/intl/test/fuzztest/normalizer_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/normalizer_fuzzer/BUILD.gn index d3c4a573..8fd80fa6 100644 --- a/frameworks/intl/test/fuzztest/normalizer_fuzzer/BUILD.gn +++ b/frameworks/intl/test/fuzztest/normalizer_fuzzer/BUILD.gn @@ -24,7 +24,11 @@ ohos_fuzztest("NormalizerFuzzTest") { fuzz_config_file = "." - include_dirs = [ "../../../include" ] + include_dirs = [ + "../../../include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", + ] cflags = [ "-g", "-O0", @@ -34,11 +38,10 @@ ohos_fuzztest("NormalizerFuzzTest") { sources = [ "normalizer_fuzzer.cpp" ] configs = [] - deps = [ "../../../../intl:intl_util" ] - - external_deps = [ - "icu:shared_icui18n", - "icu:shared_icuuc", + deps = [ + "../../../../intl:intl_util", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", ] subsystem_name = "global" diff --git a/frameworks/intl/test/fuzztest/numberformat_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/numberformat_fuzzer/BUILD.gn index 6aa07e09..2f67bad2 100644 --- a/frameworks/intl/test/fuzztest/numberformat_fuzzer/BUILD.gn +++ b/frameworks/intl/test/fuzztest/numberformat_fuzzer/BUILD.gn @@ -25,7 +25,11 @@ ohos_fuzztest("NumberFormatFuzzTest") { fuzz_config_file = "//base/global/i18n/frameworks/intl/test/fuzztest/numberformat_fuzzer" - include_dirs = [ "//base/global/i18n/frameworks/intl/include" ] + include_dirs = [ + "//base/global/i18n/frameworks/intl/include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", + ] cflags = [ "-g", "-O0", @@ -35,11 +39,10 @@ ohos_fuzztest("NumberFormatFuzzTest") { sources = [ "numberformat_fuzzer.cpp" ] configs = [] - deps = [ "//base/global/i18n/frameworks/intl:intl_util" ] - - external_deps = [ - "icu:shared_icui18n", - "icu:shared_icuuc", + deps = [ + "//base/global/i18n/frameworks/intl:intl_util", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", ] subsystem_name = "global" diff --git a/frameworks/intl/test/fuzztest/phonenumberformat_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/phonenumberformat_fuzzer/BUILD.gn index d0081ff1..1093990b 100644 --- a/frameworks/intl/test/fuzztest/phonenumberformat_fuzzer/BUILD.gn +++ b/frameworks/intl/test/fuzztest/phonenumberformat_fuzzer/BUILD.gn @@ -26,6 +26,8 @@ ohos_fuzztest("PhoneNumberFormatFuzzTest") { include_dirs = [ "//base/global/i18n/frameworks/intl/include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", "//third_party/libphonenumber", "//third_party/libphonenumber/cpp/src", "//third_party/protobuf/src", @@ -39,11 +41,10 @@ ohos_fuzztest("PhoneNumberFormatFuzzTest") { sources = [ "phonenumberformat_fuzzer.cpp" ] configs = [] - deps = [ "//base/global/i18n/frameworks/intl:intl_util" ] - - external_deps = [ - "icu:shared_icui18n", - "icu:shared_icuuc", + deps = [ + "//base/global/i18n/frameworks/intl:intl_util", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", ] subsystem_name = "global" diff --git a/frameworks/intl/test/fuzztest/phonenumbermatched_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/phonenumbermatched_fuzzer/BUILD.gn index e88f7165..0ac4be11 100644 --- a/frameworks/intl/test/fuzztest/phonenumbermatched_fuzzer/BUILD.gn +++ b/frameworks/intl/test/fuzztest/phonenumbermatched_fuzzer/BUILD.gn @@ -26,6 +26,8 @@ ohos_fuzztest("PhoneNumberMatchedFuzzTest") { include_dirs = [ "../../../include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", "//third_party/libphonenumber/cpp/src", "//third_party/libphonenumber", "//third_party/protobuf/src", @@ -41,14 +43,11 @@ ohos_fuzztest("PhoneNumberMatchedFuzzTest") { deps = [ "../../../../intl:intl_util", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", "//third_party/libphonenumber/cpp:phonenumber_standard", ] - external_deps = [ - "icu:shared_icui18n", - "icu:shared_icuuc", - ] - subsystem_name = "global" part_name = "i18n" } diff --git a/frameworks/intl/test/fuzztest/pluralrules_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/pluralrules_fuzzer/BUILD.gn index d1719d40..7bf2c5f6 100644 --- a/frameworks/intl/test/fuzztest/pluralrules_fuzzer/BUILD.gn +++ b/frameworks/intl/test/fuzztest/pluralrules_fuzzer/BUILD.gn @@ -24,7 +24,11 @@ ohos_fuzztest("PluralRulesFuzzTest") { fuzz_config_file = "." - include_dirs = [ "../../../include" ] + include_dirs = [ + "../../../include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", + ] cflags = [ "-g", "-O0", @@ -34,11 +38,10 @@ ohos_fuzztest("PluralRulesFuzzTest") { sources = [ "pluralrules_fuzzer.cpp" ] configs = [] - deps = [ "../../../../intl:intl_util" ] - - external_deps = [ - "icu:shared_icui18n", - "icu:shared_icuuc", + deps = [ + "../../../../intl:intl_util", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", ] subsystem_name = "global" diff --git a/frameworks/intl/test/fuzztest/preferredlanguage_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/preferredlanguage_fuzzer/BUILD.gn index a2d3dab4..ee55404e 100644 --- a/frameworks/intl/test/fuzztest/preferredlanguage_fuzzer/BUILD.gn +++ b/frameworks/intl/test/fuzztest/preferredlanguage_fuzzer/BUILD.gn @@ -27,6 +27,8 @@ ohos_fuzztest("PreferredLanguageFuzzTest") { include_dirs = [ "../../../include", "../../../../../interfaces/native/inner_api/preferred_language/include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", ] cflags = [ "-g", @@ -37,11 +39,10 @@ ohos_fuzztest("PreferredLanguageFuzzTest") { sources = [ "preferredlanguage_fuzzer.cpp" ] configs = [] - deps = [ "../../../../intl:preferred_language" ] - - external_deps = [ - "icu:shared_icui18n", - "icu:shared_icuuc", + deps = [ + "../../../../intl:preferred_language", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", ] subsystem_name = "global" diff --git a/frameworks/intl/test/fuzztest/regexrule_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/regexrule_fuzzer/BUILD.gn index 42341a20..40b2e074 100644 --- a/frameworks/intl/test/fuzztest/regexrule_fuzzer/BUILD.gn +++ b/frameworks/intl/test/fuzztest/regexrule_fuzzer/BUILD.gn @@ -26,6 +26,8 @@ ohos_fuzztest("RegexRuleFuzzTest") { include_dirs = [ "../../../include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", "//third_party/libphonenumber/cpp/src", "//third_party/libphonenumber", "//third_party/protobuf/src", @@ -41,14 +43,11 @@ ohos_fuzztest("RegexRuleFuzzTest") { deps = [ "../../../../intl:intl_util", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", "//third_party/libphonenumber/cpp:phonenumber_standard", ] - external_deps = [ - "icu:shared_icui18n", - "icu:shared_icuuc", - ] - subsystem_name = "global" part_name = "i18n" } diff --git a/frameworks/intl/test/fuzztest/relativetimeformat_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/relativetimeformat_fuzzer/BUILD.gn index eb3888f8..7e1f3515 100644 --- a/frameworks/intl/test/fuzztest/relativetimeformat_fuzzer/BUILD.gn +++ b/frameworks/intl/test/fuzztest/relativetimeformat_fuzzer/BUILD.gn @@ -24,7 +24,11 @@ ohos_fuzztest("RelativeTimeFormatFuzzTest") { fuzz_config_file = "//base/global/i18n/frameworks/intl/test/fuzztest/relativetimeformat_fuzzer" - include_dirs = [ "//base/global/i18n/frameworks/intl/include" ] + include_dirs = [ + "//base/global/i18n/frameworks/intl/include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", + ] cflags = [ "-g", "-O0", @@ -34,11 +38,10 @@ ohos_fuzztest("RelativeTimeFormatFuzzTest") { sources = [ "relativetimeformat_fuzzer.cpp" ] configs = [] - deps = [ "//base/global/i18n/frameworks/intl:intl_util" ] - - external_deps = [ - "icu:shared_icui18n", - "icu:shared_icuuc", + deps = [ + "//base/global/i18n/frameworks/intl:intl_util", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", ] subsystem_name = "global" diff --git a/frameworks/intl/test/fuzztest/rulesengine_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/rulesengine_fuzzer/BUILD.gn index 3193d78b..95b9babe 100644 --- a/frameworks/intl/test/fuzztest/rulesengine_fuzzer/BUILD.gn +++ b/frameworks/intl/test/fuzztest/rulesengine_fuzzer/BUILD.gn @@ -24,7 +24,11 @@ ohos_fuzztest("RulesEngineFuzzTest") { fuzz_config_file = "." - include_dirs = [ "../../../include" ] + include_dirs = [ + "../../../include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", + ] cflags = [ "-g", "-O0", @@ -36,14 +40,11 @@ ohos_fuzztest("RulesEngineFuzzTest") { deps = [ "../../../../intl:intl_util", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", "//third_party/libxml2:xml2", ] - external_deps = [ - "icu:shared_icui18n", - "icu:shared_icuuc", - ] - subsystem_name = "global" part_name = "i18n" } diff --git a/frameworks/intl/test/fuzztest/systemlocalemanager_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/systemlocalemanager_fuzzer/BUILD.gn index 54c4b1da..2d121b43 100644 --- a/frameworks/intl/test/fuzztest/systemlocalemanager_fuzzer/BUILD.gn +++ b/frameworks/intl/test/fuzztest/systemlocalemanager_fuzzer/BUILD.gn @@ -24,7 +24,11 @@ ohos_fuzztest("SystemLocaleManagerFuzzTest") { fuzz_config_file = "." - include_dirs = [ "../../../include" ] + include_dirs = [ + "../../../include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", + ] cflags = [ "-g", "-O0", @@ -34,11 +38,10 @@ ohos_fuzztest("SystemLocaleManagerFuzzTest") { sources = [ "systemlocalemanager_fuzzer.cpp" ] configs = [] - deps = [ "../../../../intl:intl_util" ] - - external_deps = [ - "icu:shared_icui18n", - "icu:shared_icuuc", + deps = [ + "../../../../intl:intl_util", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", ] subsystem_name = "global" diff --git a/frameworks/intl/test/fuzztest/taboo_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/taboo_fuzzer/BUILD.gn index f629e3b2..570a6ebc 100644 --- a/frameworks/intl/test/fuzztest/taboo_fuzzer/BUILD.gn +++ b/frameworks/intl/test/fuzztest/taboo_fuzzer/BUILD.gn @@ -24,7 +24,11 @@ ohos_fuzztest("TabooFuzzTest") { fuzz_config_file = "." - include_dirs = [ "../../../include" ] + include_dirs = [ + "../../../include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", + ] cflags = [ "-g", "-O0", @@ -34,11 +38,10 @@ ohos_fuzztest("TabooFuzzTest") { sources = [ "taboo_fuzzer.cpp" ] configs = [] - deps = [ "../../../../intl:intl_util" ] - - external_deps = [ - "icu:shared_icui18n", - "icu:shared_icuuc", + deps = [ + "../../../../intl:intl_util", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", ] subsystem_name = "global" diff --git a/frameworks/intl/test/fuzztest/timezone_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/timezone_fuzzer/BUILD.gn index e6aa96cb..40e23c6a 100644 --- a/frameworks/intl/test/fuzztest/timezone_fuzzer/BUILD.gn +++ b/frameworks/intl/test/fuzztest/timezone_fuzzer/BUILD.gn @@ -25,7 +25,11 @@ ohos_fuzztest("TimeZoneFuzzTest") { fuzz_config_file = "//base/global/i18n/frameworks/intl/test/fuzztest/timezone_fuzzer" - include_dirs = [ "//base/global/i18n/frameworks/intl/include" ] + include_dirs = [ + "//base/global/i18n/frameworks/intl/include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", + ] cflags = [ "-g", "-O0", @@ -37,14 +41,11 @@ ohos_fuzztest("TimeZoneFuzzTest") { deps = [ "//base/global/i18n/frameworks/intl:intl_util", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", "//third_party/libpng:libpng", ] - external_deps = [ - "icu:shared_icui18n", - "icu:shared_icuuc", - ] - subsystem_name = "global" part_name = "i18n" } diff --git a/frameworks/intl/test/fuzztest/utils_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/utils_fuzzer/BUILD.gn index 694b653a..0cc1aa72 100644 --- a/frameworks/intl/test/fuzztest/utils_fuzzer/BUILD.gn +++ b/frameworks/intl/test/fuzztest/utils_fuzzer/BUILD.gn @@ -25,7 +25,11 @@ ohos_fuzztest("UtilsFuzzTest") { fuzz_config_file = "//base/global/i18n/frameworks/intl/test/fuzztest/utils_fuzzer" - include_dirs = [ "//base/global/i18n/frameworks/intl/include" ] + include_dirs = [ + "//base/global/i18n/frameworks/intl/include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", + ] cflags = [ "-g", "-O0", @@ -35,11 +39,10 @@ ohos_fuzztest("UtilsFuzzTest") { sources = [ "utils_fuzzer.cpp" ] configs = [] - deps = [ "//base/global/i18n/frameworks/intl:intl_util" ] - - external_deps = [ - "icu:shared_icui18n", - "icu:shared_icuuc", + deps = [ + "//base/global/i18n/frameworks/intl:intl_util", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", ] subsystem_name = "global" diff --git a/frameworks/intl/test/unittest/locale_config_test.cpp b/frameworks/intl/test/unittest/locale_config_test.cpp index e6ab0cc9..3120d5db 100644 --- a/frameworks/intl/test/unittest/locale_config_test.cpp +++ b/frameworks/intl/test/unittest/locale_config_test.cpp @@ -16,7 +16,7 @@ #include "locale_config_test.h" #include #include "locale_config.h" -#include "unicode/locid.h" +#include "locid.h" #include "parameter.h" using namespace OHOS::Global::I18n; diff --git a/frameworks/zone/BUILD.gn b/frameworks/zone/BUILD.gn index 9c1f67d8..27998b6f 100644 --- a/frameworks/zone/BUILD.gn +++ b/frameworks/zone/BUILD.gn @@ -17,6 +17,10 @@ config("zone_util_public_configs") { include_dirs = [ "//base/global/i18n/frameworks/intl/include", "//base/global/i18n/interfaces/native/inner_api/zone/include", + "//third_party/icu/icu4c/source", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/common/unicode", + "//third_party/icu/icu4c/source/i18n", "//third_party/libphonenumber/cpp/src", "//third_party/libxml2/include", "//third_party/protobuf/src", @@ -35,16 +39,14 @@ ohos_shared_library("zone_util") { ] deps = [ "//base/global/i18n/frameworks/intl:intl_util", + "//third_party/icu/icu4c:ohos_icudat", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", "//third_party/libphonenumber/cpp:phonenumber_standard", "//third_party/libpng:libpng", "//third_party/libxml2:xml2", ] - external_deps = [ - "hilog:libhilog", - "icu:ohos_icudat", - "icu:shared_icui18n", - "icu:shared_icuuc", - ] + external_deps = [ "hilog:libhilog" ] subsystem_name = "global" part_name = "i18n" } diff --git a/frameworks/zone/src/zone_util.cpp b/frameworks/zone/src/zone_util.cpp index 78174f8c..7ae291a0 100644 --- a/frameworks/zone/src/zone_util.cpp +++ b/frameworks/zone/src/zone_util.cpp @@ -18,7 +18,7 @@ #include "hilog/log.h" #include "i18n_timezone.h" #include "ohos/init_data.h" -#include "unicode/strenum.h" +#include "strenum.h" #include "unicode/timezone.h" #include "utils.h" #include "zone_util.h" diff --git a/frameworks/zone/test/BUILD.gn b/frameworks/zone/test/BUILD.gn index 0c54d836..de73ed52 100644 --- a/frameworks/zone/test/BUILD.gn +++ b/frameworks/zone/test/BUILD.gn @@ -37,6 +37,8 @@ ohos_unittest("zone_util_test") { "//third_party/googletest/googletest/include", "//third_party/googletest/googletest", "//base/global/i18n/interfaces/native/inner_api/zone/include", + "//third_party/icu/icu4c/source/common/unicode", + "//third_party/icu/icu4c/source/common", "//third_party/libphonenumber/cpp/src", "//third_party/protobuf/src", "//third_party/protobuf/src/google", diff --git a/interfaces/js/kits/BUILD.gn b/interfaces/js/kits/BUILD.gn index 932bc81b..6fab5bc1 100644 --- a/interfaces/js/kits/BUILD.gn +++ b/interfaces/js/kits/BUILD.gn @@ -30,6 +30,9 @@ ohos_shared_library("intl") { "//foundation/arkui/napi/native_engine", "//foundation/arkui/napi/interfaces/kits", "//third_party/node/src", + "//third_party/icu/icu4c/source", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", "//third_party/libphonenumber/cpp/src", "//third_party/libphonenumber", "//third_party/protobuf/src", @@ -37,10 +40,12 @@ ohos_shared_library("intl") { sources = [ "src/intl_addon.cpp" ] - deps = [ "//base/global/i18n/frameworks/intl:intl_util" ] + deps = [ + "//base/global/i18n/frameworks/intl:intl_util", + "//third_party/icu/icu4c:shared_icuuc", + ] external_deps = [ "hilog:libhilog", - "icu:shared_icuuc", "napi:ace_napi", ] relative_install_dir = "module" @@ -58,6 +63,9 @@ ohos_shared_library("i18n") { "//foundation/arkui/napi/native_engine", "//foundation/arkui/napi/interfaces/kits", "//third_party/node/src", + "//third_party/icu/icu4c/source", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", "//third_party/libphonenumber/cpp/src", "//third_party/libphonenumber", "//third_party/protobuf/src", @@ -82,13 +90,13 @@ ohos_shared_library("i18n") { "//base/global/i18n/frameworks/intl:intl_util", "//base/global/i18n/frameworks/intl:preferred_language", "//base/global/i18n/services:i18n_sa_client", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", "//third_party/libpng:libpng", ] external_deps = [ "c_utils:utils", "hilog:libhilog", - "icu:shared_icui18n", - "icu:shared_icuuc", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/interfaces/js/kits/src/entity_recognizer_addon.cpp b/interfaces/js/kits/src/entity_recognizer_addon.cpp index 6a29f3c7..22092362 100644 --- a/interfaces/js/kits/src/entity_recognizer_addon.cpp +++ b/interfaces/js/kits/src/entity_recognizer_addon.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include +#include #include "error_util.h" #include "hilog/log.h" #include "utils.h" diff --git a/interfaces/native/inner_api/zone/include/zone_util.h b/interfaces/native/inner_api/zone/include/zone_util.h index 21d898d8..ca14643a 100644 --- a/interfaces/native/inner_api/zone/include/zone_util.h +++ b/interfaces/native/inner_api/zone/include/zone_util.h @@ -23,7 +23,7 @@ #include "libxml/tree.h" #include "libxml/xmlstring.h" #include "phonenumbers/phonenumberutil.h" -#include "unicode/strenum.h" +#include "strenum.h" namespace OHOS { namespace Global { diff --git a/services/test/BUILD.gn b/services/test/BUILD.gn index 8b22d808..6b10acd7 100644 --- a/services/test/BUILD.gn +++ b/services/test/BUILD.gn @@ -24,6 +24,7 @@ ohos_unittest("i18n_service_test") { "../../frameworks/intl/include", "../../interfaces/native/inner_api/preferred_language/include", "../../services/include", + "//third_party/icu/icu4c/source/common/unicode", ] external_deps = [ @@ -38,6 +39,8 @@ ohos_unittest("i18n_service_test") { "../../services:i18n_sa", "../../services:i18n_sa_client", "//third_party/googletest:gtest_main", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", ] defines = [ "SUPPORT_GRAPHICS" ] -- Gitee