| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 { | 5 { |
| 6 'includes': [ | 6 'includes': [ |
| 7 'icu.gypi', | 7 'icu.gypi', |
| 8 ], | 8 ], |
| 9 'variables': { | 9 'variables': { |
| 10 'use_system_icu%': 0, | 10 'use_system_icu%': 0, |
| (...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 239 }], | 239 }], |
| 240 [ 'OS == "win" and clang==1', { | 240 [ 'OS == "win" and clang==1', { |
| 241 # Note: General clang warnings should go in the | 241 # Note: General clang warnings should go in the |
| 242 # clang_warning_flags block above. | 242 # clang_warning_flags block above. |
| 243 'msvs_settings': { | 243 'msvs_settings': { |
| 244 'VCCLCompilerTool': { | 244 'VCCLCompilerTool': { |
| 245 'AdditionalOptions': [ | 245 'AdditionalOptions': [ |
| 246 # See http://bugs.icu-project.org/trac/ticket/11122 | 246 # See http://bugs.icu-project.org/trac/ticket/11122 |
| 247 '-Wno-inline-new-delete', | 247 '-Wno-inline-new-delete', |
| 248 '-Wno-implicit-exception-spec-mismatch', | 248 '-Wno-implicit-exception-spec-mismatch', |
| 249 # See http://bugs.icu-project.org/trac/ticket/11757. |
| 250 '-Wno-reorder', |
| 249 ], | 251 ], |
| 250 }, | 252 }, |
| 251 }, | 253 }, |
| 252 }], | 254 }], |
| 253 ], # conditions | 255 ], # conditions |
| 254 }, | 256 }, |
| 255 { | 257 { |
| 256 'target_name': 'icuuc', | 258 'target_name': 'icuuc', |
| 257 'type': '<(component)', | 259 'type': '<(component)', |
| 258 'sources': [ | 260 'sources': [ |
| (...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 589 }, | 591 }, |
| 590 'includes': [ | 592 'includes': [ |
| 591 '../../build/shim_headers.gypi', | 593 '../../build/shim_headers.gypi', |
| 592 ], | 594 ], |
| 593 'toolsets': ['target'], | 595 'toolsets': ['target'], |
| 594 }, | 596 }, |
| 595 ], # targets | 597 ], # targets |
| 596 }], | 598 }], |
| 597 ], # conditions | 599 ], # conditions |
| 598 } | 600 } |
| OLD | NEW |