diff options
| author |  Hal Canary <halcanary@google.com> | 2018-02-08 15:16:28 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-12 15:51:01 +0000 |
| commit | 8bb40837da773570ac80037405b8499e9f43e01d (patch) | |
| tree | fae168fd88dff7565b115a35f96e38c9c794e62c | |
| parent | e1a75ac27ed96f9ea42cf4b8cf0129d203f43d13 (diff) | |
Build ICU on iOS
Change-Id: Idc6d5ed987540bc41d64ceab87af103591dc1911
Reviewed-on: https://skia-review.googlesource.com/105800
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
| -rw-r--r-- | BUILD.gn | 3 | ||||
| -rw-r--r-- | third_party/icu/BUILD.gn | 6 |
2 files changed, 6 insertions, 3 deletions
@@ -1613,8 +1613,7 @@ if (skia_enable_tools) { ":skia", ] - # TODO(halcanary): Build ICU on iOS. - if (is_ios || target_cpu == "wasm") { + if (target_cpu == "wasm") { sources = [ "tools/shape/SkShaper_primitive.cpp", ] diff --git a/third_party/icu/BUILD.gn b/third_party/icu/BUILD.gn index 6b2482f2fb..7233fcc4c9 100644 --- a/third_party/icu/BUILD.gn +++ b/third_party/icu/BUILD.gn @@ -221,7 +221,11 @@ if (skia_use_system_icu) { libs = [ "Advapi32.lib" ] sources += [ "../externals/icu/source/stubdata/stubdata.c" ] } else { - sources += [ "../externals/icu/$current_os/icudtl_dat.S" ] + if (is_ios) { + sources += [ "../externals/icu/mac/icudtl_dat.S" ] + } else { + sources += [ "../externals/icu/$current_os/icudtl_dat.S" ] + } libs = [ "dl" ] } } |