| OLD | NEW |
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 | 9 |
| 10 'conditions': [ | 10 'conditions': [ |
| (...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 518 'dependencies': [ | 518 'dependencies': [ |
| 519 '../build/linux/system.gyp:gtk', | 519 '../build/linux/system.gyp:gtk', |
| 520 '../chrome/chrome.gyp:packed_resources', | 520 '../chrome/chrome.gyp:packed_resources', |
| 521 ], | 521 ], |
| 522 'conditions': [ | 522 'conditions': [ |
| 523 ['linux_use_tcmalloc==1', { | 523 ['linux_use_tcmalloc==1', { |
| 524 'dependencies': [ | 524 'dependencies': [ |
| 525 '../base/allocator/allocator.gyp:allocator', | 525 '../base/allocator/allocator.gyp:allocator', |
| 526 ], | 526 ], |
| 527 }], | 527 }], |
| 528 [ 'touchui==1', { |
| 529 'sources!': [ 'focus/accelerator_handler_gtk_unittest.cc' ], |
| 530 }], |
| 528 ], | 531 ], |
| 529 }, | 532 }, |
| 530 ], | 533 ], |
| 531 ['OS=="win"', { | 534 ['OS=="win"', { |
| 532 'dependencies': [ | 535 'dependencies': [ |
| 533 # TODO(jcivelli): ideally the resource needed by views would be | 536 # TODO(jcivelli): ideally the resource needed by views would be |
| 534 # factored out. (for some reason it pulls in a bunch | 537 # factored out. (for some reason it pulls in a bunch |
| 535 # unrelated things like v8, sqlite nss...). | 538 # unrelated things like v8, sqlite nss...). |
| 536 '../chrome/app/locales/locales.gyp:en-US', | 539 '../chrome/app/locales/locales.gyp:en-US', |
| 537 ], | 540 ], |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 702 | 705 |
| 703 | 706 |
| 704 ], | 707 ], |
| 705 } | 708 } |
| 706 | 709 |
| 707 # Local Variables: | 710 # Local Variables: |
| 708 # tab-width:2 | 711 # tab-width:2 |
| 709 # indent-tabs-mode:nil | 712 # indent-tabs-mode:nil |
| 710 # End: | 713 # End: |
| 711 # vim: set expandtab tabstop=2 shiftwidth=2: | 714 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |