Chromium Code Reviews| 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 'build_angle_deqp_tests%': 0, | 6 'build_angle_deqp_tests%': 0, |
| 7 'chrome_browser_extensions_test_support_sources': [ | 7 'chrome_browser_extensions_test_support_sources': [ |
| 8 # A list of sources which is shared between different browser tests. | 8 # A list of sources which is shared between different browser tests. |
| 9 'browser/apps/app_browsertest_util.cc', | 9 'browser/apps/app_browsertest_util.cc', |
| 10 'browser/apps/app_browsertest_util.h', | 10 'browser/apps/app_browsertest_util.h', |
| (...skipping 2630 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2641 }], | 2641 }], |
| 2642 ['toolkit_views==1', { | 2642 ['toolkit_views==1', { |
| 2643 'sources': [ '<@(chrome_browser_tests_views_sources)' ], | 2643 'sources': [ '<@(chrome_browser_tests_views_sources)' ], |
| 2644 'dependencies': [ | 2644 'dependencies': [ |
| 2645 '../ui/views/views.gyp:views', | 2645 '../ui/views/views.gyp:views', |
| 2646 ], | 2646 ], |
| 2647 }], | 2647 }], |
| 2648 ['toolkit_views==1 and OS!="mac"', { | 2648 ['toolkit_views==1 and OS!="mac"', { |
| 2649 'sources': [ '<@(chrome_browser_tests_views_non_mac_sources)' ], | 2649 'sources': [ '<@(chrome_browser_tests_views_non_mac_sources)' ], |
| 2650 }], | 2650 }], |
| 2651 ['toolkit_views==1 and OS!="mac" and chromeos == 0', { | 2651 ['toolkit_views==1 and (OS!="mac" or mac_views_browser==1) and chromeos == 0', { |
|
tapted
2016/07/19 05:42:30
You'll need to modify chrome/test/BUILD.gn with so
Jane
2016/07/19 13:35:39
Done.
| |
| 2652 'sources': [ '<@(chrome_browser_tests_views_non_cros_or_mac_sources)' ], | 2652 'sources': [ '<@(chrome_browser_tests_views_non_cros_or_mac_sources)' ], |
| 2653 }], | 2653 }], |
| 2654 ['OS=="linux" or OS=="win"', { | 2654 ['OS=="linux" or OS=="win"', { |
| 2655 'sources': [ '<@(chrome_browser_tests_non_mac_desktop_sources)' ], | 2655 'sources': [ '<@(chrome_browser_tests_non_mac_desktop_sources)' ], |
| 2656 }], | 2656 }], |
| 2657 ['OS=="ios"', { | 2657 ['OS=="ios"', { |
| 2658 'sources!': [ | 2658 'sources!': [ |
| 2659 # TODO(dbeam): log webui URLs on iOS and test them. | 2659 # TODO(dbeam): log webui URLs on iOS and test them. |
| 2660 'browser/ui/webui/log_web_ui_url_browsertest.cc', | 2660 'browser/ui/webui/log_web_ui_url_browsertest.cc', |
| 2661 ], | 2661 ], |
| (...skipping 925 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3587 'browser', | 3587 'browser', |
| 3588 ], | 3588 ], |
| 3589 'sources': [ | 3589 'sources': [ |
| 3590 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', | 3590 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', |
| 3591 'tools/service_discovery_sniffer/service_discovery_sniffer.h', | 3591 'tools/service_discovery_sniffer/service_discovery_sniffer.h', |
| 3592 ], | 3592 ], |
| 3593 }] | 3593 }] |
| 3594 }], | 3594 }], |
| 3595 ], # 'conditions' | 3595 ], # 'conditions' |
| 3596 } | 3596 } |
| OLD | NEW |