| 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 'variables': { | 5 'variables': { |
| 6 'chrome_browser_extensions_test_support_sources': [ | 6 'chrome_browser_extensions_test_support_sources': [ |
| 7 # A list of sources which is shared between different browser tests. | 7 # A list of sources which is shared between different browser tests. |
| 8 'browser/apps/app_browsertest_util.cc', | 8 'browser/apps/app_browsertest_util.cc', |
| 9 'browser/apps/app_browsertest_util.h', | 9 'browser/apps/app_browsertest_util.h', |
| 10 'browser/extensions/browsertest_util.cc', | 10 'browser/extensions/browsertest_util.cc', |
| (...skipping 1669 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1680 }], | 1680 }], |
| 1681 ['OS=="linux" and chromeos==0', { | 1681 ['OS=="linux" and chromeos==0', { |
| 1682 'sources!': [ | 1682 'sources!': [ |
| 1683 # TODO(port): This times out. Attempts have been made to fix the | 1683 # TODO(port): This times out. Attempts have been made to fix the |
| 1684 # individual failures, but each time I disable a test from these | 1684 # individual failures, but each time I disable a test from these |
| 1685 # suites, it seems like one or another starts timing out too. | 1685 # suites, it seems like one or another starts timing out too. |
| 1686 | 1686 |
| 1687 # Note: list duplicated in GN build. | 1687 # Note: list duplicated in GN build. |
| 1688 'browser/ui/views/keyboard_access_browsertest.cc', | 1688 'browser/ui/views/keyboard_access_browsertest.cc', |
| 1689 ], | 1689 ], |
| 1690 'sources': [ 'browser/ui/libgtk2ui/select_file_dialog_impl_test.cc' ], |
| 1691 'dependencies': [ '../build/linux/system.gyp:gtk2' ], |
| 1690 }, { # Everything but desktop Linux. | 1692 }, { # Everything but desktop Linux. |
| 1691 'sources': [ '<@(chrome_interactive_ui_test_non_desktop_linux_sources)
' ], | 1693 'sources': [ '<@(chrome_interactive_ui_test_non_desktop_linux_sources)
' ], |
| 1692 }], | 1694 }], |
| 1693 ['use_ash==1', { | 1695 ['use_ash==1', { |
| 1694 'sources': [ '<@(chrome_interactive_ui_test_ash_sources)' ], | 1696 'sources': [ '<@(chrome_interactive_ui_test_ash_sources)' ], |
| 1695 'dependencies': [ | 1697 'dependencies': [ |
| 1696 '../ash/ash.gyp:ash_interactive_ui_test_support', | 1698 '../ash/ash.gyp:ash_interactive_ui_test_support', |
| 1697 ], | 1699 ], |
| 1698 }], | 1700 }], |
| 1699 ['OS=="mac"', { | 1701 ['OS=="mac"', { |
| (...skipping 1761 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3461 'utility', | 3463 'utility', |
| 3462 ], | 3464 ], |
| 3463 'sources': [ | 3465 'sources': [ |
| 3464 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', | 3466 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', |
| 3465 'tools/service_discovery_sniffer/service_discovery_sniffer.h', | 3467 'tools/service_discovery_sniffer/service_discovery_sniffer.h', |
| 3466 ], | 3468 ], |
| 3467 }] | 3469 }] |
| 3468 }], | 3470 }], |
| 3469 ], # 'conditions' | 3471 ], # 'conditions' |
| 3470 } | 3472 } |
| OLD | NEW |