| 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 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 ], | 209 ], |
| 210 }, | 210 }, |
| 211 # Since ICU wants to internally use its own deprecated APIs, don't | 211 # Since ICU wants to internally use its own deprecated APIs, don't |
| 212 # complain about it. | 212 # complain about it. |
| 213 'cflags': [ | 213 'cflags': [ |
| 214 '-Wno-deprecated-declarations', | 214 '-Wno-deprecated-declarations', |
| 215 ], | 215 ], |
| 216 'cflags_cc': [ | 216 'cflags_cc': [ |
| 217 '-frtti', | 217 '-frtti', |
| 218 ], | 218 ], |
| 219 'cflags_cc!': [ |
| 220 '-fno-rtti', |
| 221 ], |
| 219 'xcode_settings': { | 222 'xcode_settings': { |
| 220 'GCC_ENABLE_CPP_RTTI': 'YES', # -frtti | 223 'GCC_ENABLE_CPP_RTTI': 'YES', # -frtti |
| 221 }, | 224 }, |
| 222 'msvs_settings': { | 225 'msvs_settings': { |
| 223 'VCCLCompilerTool': { | 226 'VCCLCompilerTool': { |
| 224 'RuntimeTypeInfo': 'true', | 227 'RuntimeTypeInfo': 'true', |
| 225 }, | 228 }, |
| 226 }, | 229 }, |
| 227 'conditions': [ | 230 'conditions': [ |
| 228 [ 'use_system_icu==1 and want_separate_host_toolset==1', { | 231 [ 'use_system_icu==1 and want_separate_host_toolset==1', { |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 310 }, | 313 }, |
| 311 'cflags': [ | 314 'cflags': [ |
| 312 # Since ICU wants to internally use its own deprecated APIs, | 315 # Since ICU wants to internally use its own deprecated APIs, |
| 313 # don't complain about it. | 316 # don't complain about it. |
| 314 '-Wno-deprecated-declarations', | 317 '-Wno-deprecated-declarations', |
| 315 '-Wno-unused-function', | 318 '-Wno-unused-function', |
| 316 ], | 319 ], |
| 317 'cflags_cc': [ | 320 'cflags_cc': [ |
| 318 '-frtti', | 321 '-frtti', |
| 319 ], | 322 ], |
| 323 'cflags_cc!': [ |
| 324 '-fno-rtti', |
| 325 ], |
| 320 'xcode_settings': { | 326 'xcode_settings': { |
| 321 'GCC_ENABLE_CPP_RTTI': 'YES', # -frtti | 327 'GCC_ENABLE_CPP_RTTI': 'YES', # -frtti |
| 322 }, | 328 }, |
| 323 'msvs_settings': { | 329 'msvs_settings': { |
| 324 'VCCLCompilerTool': { | 330 'VCCLCompilerTool': { |
| 325 'RuntimeTypeInfo': 'true', | 331 'RuntimeTypeInfo': 'true', |
| 326 }, | 332 }, |
| 327 }, | 333 }, |
| 328 'all_dependent_settings': { | 334 'all_dependent_settings': { |
| 329 'msvs_settings': { | 335 'msvs_settings': { |
| (...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 602 }, | 608 }, |
| 603 'includes': [ | 609 'includes': [ |
| 604 '../../build/shim_headers.gypi', | 610 '../../build/shim_headers.gypi', |
| 605 ], | 611 ], |
| 606 'toolsets': ['target'], | 612 'toolsets': ['target'], |
| 607 }, | 613 }, |
| 608 ], # targets | 614 ], # targets |
| 609 }], | 615 }], |
| 610 ], # conditions | 616 ], # conditions |
| 611 } | 617 } |
| OLD | NEW |