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 'variables': { | 6 'variables': { |
7 'chromium_code': 1, | 7 'chromium_code': 1, |
8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', | 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', |
9 }, | 9 }, |
10 'includes': [ | 10 'includes': [ |
(...skipping 1068 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1079 }], | 1079 }], |
1080 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 | 1080 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 |
1081 ['OS=="linux" and component=="shared_library" and ((use_allocator!="none
" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" a
nd linux_use_tcmalloc==1))', { | 1081 ['OS=="linux" and component=="shared_library" and ((use_allocator!="none
" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" a
nd linux_use_tcmalloc==1))', { |
1082 'dependencies': [ | 1082 'dependencies': [ |
1083 '<(DEPTH)/base/allocator/allocator.gyp:allocator', | 1083 '<(DEPTH)/base/allocator/allocator.gyp:allocator', |
1084 ], | 1084 ], |
1085 'link_settings': { | 1085 'link_settings': { |
1086 'ldflags': ['-rdynamic'], | 1086 'ldflags': ['-rdynamic'], |
1087 }, | 1087 }, |
1088 }], | 1088 }], |
| 1089 ['use_ozone==1', { |
| 1090 'sources!': [ |
| 1091 'sticky_keys/sticky_keys_unittest.cc', # crbug.com/354035 |
| 1092 ], |
| 1093 }], |
1089 ], | 1094 ], |
1090 }, | 1095 }, |
1091 { | 1096 { |
1092 'target_name': 'ash_shell', | 1097 'target_name': 'ash_shell', |
1093 'type': 'executable', | 1098 'type': 'executable', |
1094 'dependencies': [ | 1099 'dependencies': [ |
1095 'ash_strings.gyp:ash_strings', | 1100 'ash_strings.gyp:ash_strings', |
1096 '../base/base.gyp:base', | 1101 '../base/base.gyp:base', |
1097 '../base/base.gyp:base_i18n', | 1102 '../base/base.gyp:base_i18n', |
1098 '../chrome/chrome_resources.gyp:packed_resources', | 1103 '../chrome/chrome_resources.gyp:packed_resources', |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1170 }], | 1175 }], |
1171 ['chromeos==1', { | 1176 ['chromeos==1', { |
1172 'dependencies': [ | 1177 'dependencies': [ |
1173 '../device/bluetooth/bluetooth.gyp:device_bluetooth', | 1178 '../device/bluetooth/bluetooth.gyp:device_bluetooth', |
1174 ], | 1179 ], |
1175 }], | 1180 }], |
1176 ], | 1181 ], |
1177 }, | 1182 }, |
1178 ], | 1183 ], |
1179 } | 1184 } |
OLD | NEW |