Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(162)

Side by Side Diff: chrome/chrome_tests.gypi

Issue 1963373003: Revert of Remove dependencies on chrome\installer from the ChromeCrashReporterClient class on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/chrome_exe.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1714 matching lines...) Expand 10 before | Expand all | Expand 10 after
1725 ['OS=="linux" and chromeos==0 and use_ozone==0', { 1725 ['OS=="linux" and chromeos==0 and use_ozone==0', {
1726 'sources': [ 'browser/ui/libgtk2ui/select_file_dialog_interactive_uite st.cc' ], 1726 'sources': [ 'browser/ui/libgtk2ui/select_file_dialog_interactive_uite st.cc' ],
1727 'dependencies': [ '../build/linux/system.gyp:gtk2' ], 1727 'dependencies': [ '../build/linux/system.gyp:gtk2' ],
1728 }], 1728 }],
1729 ['use_ash==1', { 1729 ['use_ash==1', {
1730 'sources': [ '<@(chrome_interactive_ui_test_ash_sources)' ], 1730 'sources': [ '<@(chrome_interactive_ui_test_ash_sources)' ],
1731 'dependencies': [ 1731 'dependencies': [
1732 '../ash/ash.gyp:ash_interactive_ui_test_support', 1732 '../ash/ash.gyp:ash_interactive_ui_test_support',
1733 ], 1733 ],
1734 }], 1734 }],
1735 ['OS=="win"', {
1736 'dependencies': [
1737 'chrome.gyp:install_static_util',
1738 ],
1739 }],
1740 ['OS=="mac"', { 1735 ['OS=="mac"', {
1741 'dependencies': [ 1736 'dependencies': [
1742 'chrome' 1737 'chrome'
1743 ], 1738 ],
1744 # See comment about the same line in chrome/chrome_tests.gypi. 1739 # See comment about the same line in chrome/chrome_tests.gypi.
1745 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 1740 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
1746 'conditions' : [ 1741 'conditions' : [
1747 # The browser window can be views or Cocoa on Mac. Test accordingly. 1742 # The browser window can be views or Cocoa on Mac. Test accordingly.
1748 ['mac_views_browser==1', { 1743 ['mac_views_browser==1', {
1749 'sources': [ '<@(chrome_interactive_ui_test_views_non_mac_sources) ' ], 1744 'sources': [ '<@(chrome_interactive_ui_test_views_non_mac_sources) ' ],
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
2285 '../components/components.gyp:arc_test_support', 2280 '../components/components.gyp:arc_test_support',
2286 '../third_party/boringssl/boringssl.gyp:boringssl', 2281 '../third_party/boringssl/boringssl.gyp:boringssl',
2287 ] 2282 ]
2288 }, { 2283 }, {
2289 'conditions': [ 2284 'conditions': [
2290 ['OS == "linux" or OS == "win"', { 2285 ['OS == "linux" or OS == "win"', {
2291 'sources': [ 2286 'sources': [
2292 'browser/ui/views/ime/ime_warning_bubble_browsertest.cc', 2287 'browser/ui/views/ime/ime_warning_bubble_browsertest.cc',
2293 'browser/ui/views/ime/ime_window_browsertest.cc', 2288 'browser/ui/views/ime/ime_window_browsertest.cc',
2294 ], 2289 ],
2295 }], 2290 }]
2296 ['OS=="win"', {
2297 'dependencies': [
2298 'chrome.gyp:install_static_util',
2299 ],
2300 }],
2301 ] 2291 ]
2302 }], 2292 }],
2303 ['enable_wifi_display==1', { 2293 ['enable_wifi_display==1', {
2304 'sources': [ 2294 'sources': [
2305 '<@(chrome_browser_tests_display_source_apitest)', 2295 '<@(chrome_browser_tests_display_source_apitest)',
2306 ], 2296 ],
2307 }], 2297 }],
2308 ['enable_one_click_signin==0', { 2298 ['enable_one_click_signin==0', {
2309 'sources!': [ 2299 'sources!': [
2310 'browser/ui/sync/one_click_signin_links_delegate_impl_browsertest.cc ', 2300 'browser/ui/sync/one_click_signin_links_delegate_impl_browsertest.cc ',
(...skipping 1291 matching lines...) Expand 10 before | Expand all | Expand 10 after
3602 'browser', 3592 'browser',
3603 ], 3593 ],
3604 'sources': [ 3594 'sources': [
3605 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3595 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3606 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3596 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3607 ], 3597 ],
3608 }] 3598 }]
3609 }], 3599 }],
3610 ], # 'conditions' 3600 ], # 'conditions'
3611 } 3601 }
OLDNEW
« no previous file with comments | « chrome/chrome_exe.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698