openharmony/third_party_icu
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_icu synced 2024-12-03 14:40:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

break dep cycle

Browse Source 
Signed-off-by: 罗博明 <luoboming@huawei.com>
This commit is contained in:
罗博明 2024-08-20 09:28:38 +00:00 committed by Gitee
parent 80cf7826ce
commit c5e4a38f93
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
icu4c/BUILD.gn
View File

@ -54,15 +54,6 @@ ohos_static_library("static_icustubdata") {
subsystem_name = "thirdparty"
}
ohos_prebuilt_etc("ohos_icudat") {
source = "$root_out_dir/thirdparty/icu/out/$icu_dat_name.dat"
deps = [ "//third_party/icu/ohos_icu4c:pkg_icudata" ]
module_install_dir = "usr/ohos_icu/"
part_name = "icu"
subsystem_name = "thirdparty"
}
icu_common_source = [
"//third_party/icu/icu4c/source/common/ubiditransform.cpp",
"//third_party/icu/icu4c/source/common/locutil.cpp",
@ -535,10 +526,7 @@ ohos_shared_library("shared_icuuc") {
"SYSTEM_TZDATA_DIR=${system_tzdata_dir}",
]
sources = icu_common_source
deps = [
":ohos_icudat",
":static_icustubdata",
]
deps = [ ":static_icustubdata" ]
cflags_cc = [
"-O3",
"-W",

11
ohos_icu4c/BUILD.gn
View File

@ -29,6 +29,7 @@ ohos_shared_library("icundk") {
sources = [ "src/icu_addon.cpp" ]
deps = [
":ohos_icudat",
"//third_party/icu/icu4c:shared_icui18n",
"//third_party/icu/icu4c:shared_icuuc",
]
@ -71,3 +72,13 @@ action("pkg_icudata") {
]
outputs = [ "$root_out_dir/thirdparty/icu/out/$icu_dat_name.dat" ]
}
ohos_prebuilt_etc("ohos_icudat") {
source = "$root_out_dir/thirdparty/icu/out/$icu_dat_name.dat"
deps = [ ":pkg_icudata" ]
module_install_dir = "usr/ohos_icu/"
part_name = "icu"
subsystem_name = "thirdparty"
}