| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 '../../native_client/build/untrusted.gypi', | 8 '../../native_client/build/untrusted.gypi', |
| 9 ], | 9 ], |
| 10 'target_defaults': { | 10 'target_defaults': { |
| 11 'direct_dependent_settings': { | 11 'direct_dependent_settings': { |
| 12 'defines': [ | 12 'defines': [ |
| 13 # Tell ICU to not insert |using namespace icu;| into its headers, | 13 # Tell ICU to not insert |using namespace icu;| into its headers, |
| 14 # so that chrome's source explicitly has to use |icu::|. | 14 # so that chrome's source explicitly has to use |icu::|. |
| 15 'U_USING_ICU_NAMESPACE=0', | 15 'U_USING_ICU_NAMESPACE=0', |
| 16 # We don't use ICU plugins and dyload is only necessary for them. |
| 17 # NaCl-related builds also fail looking for dlfcn.h when it's enabled. |
| 18 'U_ENABLE_DYLOAD=0', |
| 16 ], | 19 ], |
| 17 }, | 20 }, |
| 18 'defines': [ | 21 'defines': [ |
| 19 'U_USING_ICU_NAMESPACE=0', | 22 'U_USING_ICU_NAMESPACE=0', |
| 20 'U_STATIC_IMPLEMENTATION', | 23 'U_STATIC_IMPLEMENTATION', |
| 21 ], | 24 ], |
| 22 'include_dirs': [ | 25 'include_dirs': [ |
| 23 'source/common', | 26 'source/common', |
| 24 'source/i18n', | 27 'source/i18n', |
| 25 ], | 28 ], |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 'include_dirs': [ | 102 'include_dirs': [ |
| 100 'source/common', | 103 'source/common', |
| 101 ], | 104 ], |
| 102 'defines': [ | 105 'defines': [ |
| 103 'U_STATIC_IMPLEMENTATION', | 106 'U_STATIC_IMPLEMENTATION', |
| 104 ], | 107 ], |
| 105 }, | 108 }, |
| 106 }, | 109 }, |
| 107 ], | 110 ], |
| 108 } | 111 } |
| OLD | NEW |