| 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 505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 516 'dependencies': [ | 516 'dependencies': [ |
| 517 '../build/linux/system.gyp:gtk', | 517 '../build/linux/system.gyp:gtk', |
| 518 '../chrome/chrome.gyp:packed_resources', | 518 '../chrome/chrome.gyp:packed_resources', |
| 519 ], | 519 ], |
| 520 'conditions': [ | 520 'conditions': [ |
| 521 ['linux_use_tcmalloc==1', { | 521 ['linux_use_tcmalloc==1', { |
| 522 'dependencies': [ | 522 'dependencies': [ |
| 523 '../base/allocator/allocator.gyp:allocator', | 523 '../base/allocator/allocator.gyp:allocator', |
| 524 ], | 524 ], |
| 525 }], | 525 }], |
| 526 [ 'touchui==1', { |
| 527 'sources!': [ 'focus/accelerator_handler_gtk_unittest.cc' ], |
| 528 }], |
| 526 ], | 529 ], |
| 527 }, | 530 }, |
| 528 ], | 531 ], |
| 529 ['OS=="win"', { | 532 ['OS=="win"', { |
| 530 'dependencies': [ | 533 'dependencies': [ |
| 531 # TODO(jcivelli): ideally the resource needed by views would be | 534 # TODO(jcivelli): ideally the resource needed by views would be |
| 532 # factored out. (for some reason it pulls in a bunch | 535 # factored out. (for some reason it pulls in a bunch |
| 533 # unrelated things like v8, sqlite nss...). | 536 # unrelated things like v8, sqlite nss...). |
| 534 '../chrome/app/locales/locales.gyp:en-US', | 537 '../chrome/app/locales/locales.gyp:en-US', |
| 535 ], | 538 ], |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 747 | 750 |
| 748 | 751 |
| 749 ], | 752 ], |
| 750 } | 753 } |
| 751 | 754 |
| 752 # Local Variables: | 755 # Local Variables: |
| 753 # tab-width:2 | 756 # tab-width:2 |
| 754 # indent-tabs-mode:nil | 757 # indent-tabs-mode:nil |
| 755 # End: | 758 # End: |
| 756 # vim: set expandtab tabstop=2 shiftwidth=2: | 759 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |