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

Side by Side Diff: build/all.gyp

Issue 12213044: Depend on xdisplaycheck when use_x11==1, not when toolkit_uses_gtk==1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Depend on xdisplaycheck when use_x11==1, not when toolkit_uses_gtk==1 Created 7 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/chrome_tests.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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'All', 8 'target_name': 'All',
9 'type': 'none', 9 'type': 'none',
10 'xcode_create_dependents_test_runner': 1, 10 'xcode_create_dependents_test_runner': 1,
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 }], 101 }],
102 ['chromeos==0', { 102 ['chromeos==0', {
103 'dependencies': [ 103 'dependencies': [
104 '../third_party/cros_dbus_cplusplus/cros_dbus_cplusplus.gyp:*', 104 '../third_party/cros_dbus_cplusplus/cros_dbus_cplusplus.gyp:*',
105 '../third_party/libmtp/libmtp.gyp:*', 105 '../third_party/libmtp/libmtp.gyp:*',
106 '../third_party/mtpd/mtpd.gyp:*', 106 '../third_party/mtpd/mtpd.gyp:*',
107 ], 107 ],
108 }], 108 }],
109 ], 109 ],
110 }], 110 }],
111 ['use_x11==1', {
112 'dependencies': [
113 '../tools/xdisplaycheck/xdisplaycheck.gyp:*',
114 ],
115 }],
111 ['toolkit_uses_gtk==1', { 116 ['toolkit_uses_gtk==1', {
112 'dependencies': [ 117 'dependencies': [
113 '../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*', 118 '../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*',
114 '../tools/xdisplaycheck/xdisplaycheck.gyp:*',
115 ], 119 ],
116 }], 120 }],
117 ['OS=="win"', { 121 ['OS=="win"', {
118 'conditions': [ 122 'conditions': [
119 ['win_use_allocator_shim==1', { 123 ['win_use_allocator_shim==1', {
120 'dependencies': [ 124 'dependencies': [
121 '../base/allocator/allocator.gyp:*', 125 '../base/allocator/allocator.gyp:*',
122 ], 126 ],
123 }], 127 }],
124 ], 128 ],
(...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after
772 '../chrome/chrome.gyp:browser_tests_run', 776 '../chrome/chrome.gyp:browser_tests_run',
773 '../chrome/chrome.gyp:sync_integration_tests_run', 777 '../chrome/chrome.gyp:sync_integration_tests_run',
774 '../chrome/chrome.gyp:unit_tests_run', 778 '../chrome/chrome.gyp:unit_tests_run',
775 '../net/net.gyp:net_unittests_run', 779 '../net/net.gyp:net_unittests_run',
776 ], 780 ],
777 }, # target_name: chromium_swarm_tests 781 }, # target_name: chromium_swarm_tests
778 ], 782 ],
779 }], 783 }],
780 ], # conditions 784 ], # conditions
781 } 785 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698