| 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 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 'toolsets': ['target'], | 225 'toolsets': ['target'], |
| 226 }], | 226 }], |
| 227 ['OS == "android" and clang==0', { | 227 ['OS == "android" and clang==0', { |
| 228 # Disable sincos() optimization to avoid a linker error since | 228 # Disable sincos() optimization to avoid a linker error since |
| 229 # Android's math library doesn't have sincos(). Either | 229 # Android's math library doesn't have sincos(). Either |
| 230 # -fno-builtin-sin or -fno-builtin-cos works. | 230 # -fno-builtin-sin or -fno-builtin-cos works. |
| 231 'cflags': [ | 231 'cflags': [ |
| 232 '-fno-builtin-sin', | 232 '-fno-builtin-sin', |
| 233 ], | 233 ], |
| 234 }], | 234 }], |
| 235 [ 'OS == "win" and clang==1', { |
| 236 # Note: General clang warnings should go in the |
| 237 # clang_warning_flags block above. |
| 238 'msvs_settings': { |
| 239 'VCCLCompilerTool': { |
| 240 'AdditionalOptions': [ |
| 241 # See http://bugs.icu-project.org/trac/ticket/11122 |
| 242 '-Wno-inline-new-delete', |
| 243 '-Wno-implicit-exception-spec-mismatch', |
| 244 ], |
| 245 }, |
| 246 }, |
| 247 }], |
| 235 ['OS == "android" and use_system_stlport == 1', { | 248 ['OS == "android" and use_system_stlport == 1', { |
| 236 'target_conditions': [ | 249 'target_conditions': [ |
| 237 ['_toolset == "target"', { | 250 ['_toolset == "target"', { |
| 238 # ICU requires RTTI, which is not present in the system's | 251 # ICU requires RTTI, which is not present in the system's |
| 239 # stlport, so we have to include gabi++. | 252 # stlport, so we have to include gabi++. |
| 240 'include_dirs': [ | 253 'include_dirs': [ |
| 241 '<(android_src)/abi/cpp/include', | 254 '<(android_src)/abi/cpp/include', |
| 242 ], | 255 ], |
| 243 'link_settings': { | 256 'link_settings': { |
| 244 'libraries': [ | 257 'libraries': [ |
| (...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 608 }, | 621 }, |
| 609 'includes': [ | 622 'includes': [ |
| 610 '../../build/shim_headers.gypi', | 623 '../../build/shim_headers.gypi', |
| 611 ], | 624 ], |
| 612 'toolsets': ['target'], | 625 'toolsets': ['target'], |
| 613 }, | 626 }, |
| 614 ], # targets | 627 ], # targets |
| 615 }], | 628 }], |
| 616 ], # conditions | 629 ], # conditions |
| 617 } | 630 } |
| OLD | NEW |