Chromium Code Reviews| Index: BUILD.gn |
| diff --git a/BUILD.gn b/BUILD.gn |
| index aee9fe4ad1a551c87a4906ab740937f9a3347f9f..0a66a5e9579db4269fd22cdc386594ff4b0d857f 100644 |
| --- a/BUILD.gn |
| +++ b/BUILD.gn |
| @@ -18,6 +18,10 @@ import("//build_overrides/v8.gni") |
| import("snapshot_toolchain.gni") |
| declare_args() { |
| + # Use ICU data file (icudtl.dat) if true or library (shared on windows, |
| + # static otherwise). |
| + icu_use_data_file_flag = true |
| + |
| # Enable the snapshot feature, for fast context creation. |
| # http://v8project.blogspot.com/2015/09/custom-startup-snapshots.html |
| v8_use_snapshot = true |
| @@ -1836,8 +1840,15 @@ v8_source_set("v8_base") { |
| deps += [ "//third_party/icu:icudata" ] |
| } |
| - # TODO(jochen): Add support for icu_use_data_file_flag |
| - defines += [ "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE" ] |
| + if (icu_use_data_file_flag) { |
| + defines += [ "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE" ] |
| + } else { |
| + if (is_win) { |
|
vogelheim
2016/05/18 14:16:56
style nitpick: GN manual uses else-if on one line,
Michael Achenbach
2016/05/18 14:23:37
Done.
|
| + defines += [ "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_SHARED" ] |
| + } else { |
| + defines += [ "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC" ] |
| + } |
| + } |
| } else { |
| sources -= [ |
| "src/i18n.cc", |