Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//third_party/icu/config.gni") | 5 import("//third_party/icu/config.gni") |
| 6 | 6 |
| 7 if (is_android) { | 7 if (is_android) { |
| 8 import("//build/config/android/rules.gni") | 8 import("//build/config/android/rules.gni") |
| 9 } | 9 } |
| 10 | 10 |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 72 cflags += [ | 72 cflags += [ |
| 73 "/wd4005", # Macro redefinition. | 73 "/wd4005", # Macro redefinition. |
| 74 "/wd4068", # Unknown pragmas. | 74 "/wd4068", # Unknown pragmas. |
| 75 "/wd4267", # Conversion from size_t on 64-bits. | 75 "/wd4267", # Conversion from size_t on 64-bits. |
| 76 # http://bugs.icu-project.org/trac/ticket/12821 | 76 # http://bugs.icu-project.org/trac/ticket/12821 |
| 77 "/wd4333", # Right shift by too large amount. | 77 "/wd4333", # Right shift by too large amount. |
| 78 ] | 78 ] |
| 79 } else if (is_linux || is_android) { | 79 } else if (is_linux || is_android) { |
| 80 cflags += [ | 80 cflags += [ |
| 81 "-Wno-unused-function", | 81 "-Wno-unused-function", |
| 82 # ICU uses its own deprecated functions. | |
| 83 "-Wno-deprecated-declarations", | |
| 82 ] | 84 ] |
| 83 } | 85 } |
| 84 if (is_clang) { | 86 if (is_clang) { |
| 85 cflags += [ | 87 cflags += [ |
| 86 # ICU uses its own deprecated functions. | |
| 87 "-Wno-deprecated-declarations", | |
|
Nico
2016/12/12 15:00:53
this breaks win/clang builds
tsniatowski
2016/12/12 15:04:21
interesting. this exists already at around line 51
Nico
2016/12/12 15:09:05
Either that, or just keep these two lines here and
| |
| 88 # ICU has some code with the pattern: | 88 # ICU has some code with the pattern: |
| 89 # if (found = uprv_getWindowsTimeZoneInfo(...)) | 89 # if (found = uprv_getWindowsTimeZoneInfo(...)) |
| 90 "-Wno-parentheses", | 90 "-Wno-parentheses", |
| 91 # ucnv2022.cpp contains three functions that are only used when | 91 # ucnv2022.cpp contains three functions that are only used when |
| 92 # certain preprocessor defines are set. | 92 # certain preprocessor defines are set. |
| 93 # unistr.cpp also has an unused function for non-component builds. | 93 # unistr.cpp also has an unused function for non-component builds. |
| 94 "-Wno-unused-function", | 94 "-Wno-unused-function", |
| 95 ] | 95 ] |
| 96 } | 96 } |
| 97 } | 97 } |
| (...skipping 927 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1025 } | 1025 } |
| 1026 } | 1026 } |
| 1027 | 1027 |
| 1028 source_set("icudata") { | 1028 source_set("icudata") { |
| 1029 sources = [ "$data_assembly" ] | 1029 sources = [ "$data_assembly" ] |
| 1030 defines = [ "U_HIDE_DATA_SYMBOL" ] | 1030 defines = [ "U_HIDE_DATA_SYMBOL" ] |
| 1031 deps = [ ":make_data_assembly", ] | 1031 deps = [ ":make_data_assembly", ] |
| 1032 } | 1032 } |
| 1033 } | 1033 } |
| 1034 } | 1034 } |
| OLD | NEW |