| 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 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 }, | 8 }, |
| 9 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 }], | 163 }], |
| 164 ['use_pango == 1', { | 164 ['use_pango == 1', { |
| 165 'dependencies': [ | 165 'dependencies': [ |
| 166 '../build/linux/system.gyp:fontconfig', | 166 '../build/linux/system.gyp:fontconfig', |
| 167 '../build/linux/system.gyp:pangocairo', | 167 '../build/linux/system.gyp:pangocairo', |
| 168 ], | 168 ], |
| 169 'sources': [ | 169 'sources': [ |
| 170 'gfx/platform_font_pango_unittest.cc', | 170 'gfx/platform_font_pango_unittest.cc', |
| 171 ], | 171 ], |
| 172 'conditions': [ | 172 'conditions': [ |
| 173 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 | 173 ['use_allocator!="none"', { |
| 174 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (
use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', { | |
| 175 'dependencies': [ | 174 'dependencies': [ |
| 176 '../base/allocator/allocator.gyp:allocator', | 175 '../base/allocator/allocator.gyp:allocator', |
| 177 ], | 176 ], |
| 178 }], | 177 }], |
| 179 ], | 178 ], |
| 180 }], | 179 }], |
| 181 ['use_x11==1', { | 180 ['use_x11==1', { |
| 182 'dependencies': [ | 181 'dependencies': [ |
| 183 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 182 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 184 ], | 183 ], |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 277 ], | 276 ], |
| 278 'variables': { | 277 'variables': { |
| 279 'test_suite_name': 'ui_unittests', | 278 'test_suite_name': 'ui_unittests', |
| 280 }, | 279 }, |
| 281 'includes': [ '../build/apk_test.gypi' ], | 280 'includes': [ '../build/apk_test.gypi' ], |
| 282 }, | 281 }, |
| 283 ], | 282 ], |
| 284 }], | 283 }], |
| 285 ], | 284 ], |
| 286 } | 285 } |
| OLD | NEW |