| 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, |
| 11 'icu_use_data_file_flag%': 0, | 11 'icu_use_data_file_flag%': 0, |
| 12 'want_separate_host_toolset%': 1, | 12 'want_separate_host_toolset%': 1, |
| 13 }, | 13 }, |
| 14 'target_defaults': { | 14 'target_defaults': { |
| 15 'direct_dependent_settings': { | 15 'direct_dependent_settings': { |
| 16 'defines': [ | 16 'defines': [ |
| 17 # Tell ICU to not insert |using namespace icu;| into its headers, | 17 # Tell ICU to not insert |using namespace icu;| into its headers, |
| 18 # so that chrome's source explicitly has to use |icu::|. | 18 # so that chrome's source explicitly has to use |icu::|. |
| 19 'U_USING_ICU_NAMESPACE=0', | 19 'U_USING_ICU_NAMESPACE=0', |
| 20 'U_DISABLE_RENAMING=1', |
| 20 ], | 21 ], |
| 21 }, | 22 }, |
| 22 'defines': [ | 23 'defines': [ |
| 23 'U_USING_ICU_NAMESPACE=0', | 24 'U_USING_ICU_NAMESPACE=0', |
| 25 'U_DISABLE_RENAMING=1', |
| 24 ], | 26 ], |
| 25 'conditions': [ | 27 'conditions': [ |
| 26 ['component=="static_library"', { | 28 ['component=="static_library"', { |
| 27 'defines': [ | 29 'defines': [ |
| 28 'U_STATIC_IMPLEMENTATION', | 30 'U_STATIC_IMPLEMENTATION', |
| 29 ], | 31 ], |
| 30 }], | 32 }], |
| 31 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ | 33 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ |
| 32 or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \ | 34 or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \ |
| 33 (target_arch=="arm" or target_arch=="ia32" or \ | 35 (target_arch=="arm" or target_arch=="ia32" or \ |
| (...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 595 }, | 597 }, |
| 596 'includes': [ | 598 'includes': [ |
| 597 '../../build/shim_headers.gypi', | 599 '../../build/shim_headers.gypi', |
| 598 ], | 600 ], |
| 599 'toolsets': ['target'], | 601 'toolsets': ['target'], |
| 600 }, | 602 }, |
| 601 ], # targets | 603 ], # targets |
| 602 }], | 604 }], |
| 603 ], # conditions | 605 ], # conditions |
| 604 } | 606 } |
| OLD | NEW |