| 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 1665 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1676 }], | 1676 }], |
| 1677 ['OS=="linux" and chromeos==0', { | 1677 ['OS=="linux" and chromeos==0', { |
| 1678 'sources!': [ | 1678 'sources!': [ |
| 1679 # TODO(port): This times out. Attempts have been made to fix the | 1679 # TODO(port): This times out. Attempts have been made to fix the |
| 1680 # individual failures, but each time I disable a test from these | 1680 # individual failures, but each time I disable a test from these |
| 1681 # suites, it seems like one or another starts timing out too. | 1681 # suites, it seems like one or another starts timing out too. |
| 1682 | 1682 |
| 1683 # Note: list duplicated in GN build. | 1683 # Note: list duplicated in GN build. |
| 1684 'browser/ui/views/keyboard_access_browsertest.cc', | 1684 'browser/ui/views/keyboard_access_browsertest.cc', |
| 1685 ], | 1685 ], |
| 1686 'sources': [ 'browser/ui/libgtk2ui/select_file_dialog_impl_test.cc' ], |
| 1687 'dependencies': [ '../build/linux/system.gyp:gtk2' ], |
| 1686 }, { # Everything but desktop Linux. | 1688 }, { # Everything but desktop Linux. |
| 1687 'sources': [ '<@(chrome_interactive_ui_test_non_desktop_linux_sources)
' ], | 1689 'sources': [ '<@(chrome_interactive_ui_test_non_desktop_linux_sources)
' ], |
| 1688 }], | 1690 }], |
| 1689 ['use_ash==1', { | 1691 ['use_ash==1', { |
| 1690 'sources': [ '<@(chrome_interactive_ui_test_ash_sources)' ], | 1692 'sources': [ '<@(chrome_interactive_ui_test_ash_sources)' ], |
| 1691 'dependencies': [ | 1693 'dependencies': [ |
| 1692 '../ash/ash.gyp:ash_interactive_ui_test_support', | 1694 '../ash/ash.gyp:ash_interactive_ui_test_support', |
| 1693 ], | 1695 ], |
| 1694 }], | 1696 }], |
| 1695 ['OS=="mac"', { | 1697 ['OS=="mac"', { |
| (...skipping 1761 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3457 'utility', | 3459 'utility', |
| 3458 ], | 3460 ], |
| 3459 'sources': [ | 3461 'sources': [ |
| 3460 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', | 3462 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', |
| 3461 'tools/service_discovery_sniffer/service_discovery_sniffer.h', | 3463 'tools/service_discovery_sniffer/service_discovery_sniffer.h', |
| 3462 ], | 3464 ], |
| 3463 }] | 3465 }] |
| 3464 }], | 3466 }], |
| 3465 ], # 'conditions' | 3467 ], # 'conditions' |
| 3466 } | 3468 } |
| OLD | NEW |