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

Side by Side Diff: build/all.gyp

Issue 238633004: Remove all uses of toolkit_use_gtk in the gyp files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 6 years, 8 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 | « base/base.gyp ('k') | build/build_config.h » ('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 'variables': { 6 'variables': {
7 # A hook that can be overridden in other repositories to add additional 7 # A hook that can be overridden in other repositories to add additional
8 # compilation targets to 'All'. Only used on Android. 8 # compilation targets to 'All'. Only used on Android.
9 'android_app_targets%': [], 9 'android_app_targets%': [],
10 }, 10 },
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 '../tools/ipc_fuzzer/ipc_fuzzer.gyp:*', 145 '../tools/ipc_fuzzer/ipc_fuzzer.gyp:*',
146 ], 146 ],
147 }], 147 }],
148 ], 148 ],
149 }], 149 }],
150 ['use_x11==1', { 150 ['use_x11==1', {
151 'dependencies': [ 151 'dependencies': [
152 '../tools/xdisplaycheck/xdisplaycheck.gyp:*', 152 '../tools/xdisplaycheck/xdisplaycheck.gyp:*',
153 ], 153 ],
154 }], 154 }],
155 ['toolkit_uses_gtk==1', {
156 'dependencies': [
157 '../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*',
158 ],
159 }],
160 ['OS=="win"', { 155 ['OS=="win"', {
161 'conditions': [ 156 'conditions': [
162 ['win_use_allocator_shim==1', { 157 ['win_use_allocator_shim==1', {
163 'dependencies': [ 158 'dependencies': [
164 '../base/allocator/allocator.gyp:*', 159 '../base/allocator/allocator.gyp:*',
165 ], 160 ],
166 }], 161 }],
167 # Don't enable dependencies that don't work on Win64. 162 # Don't enable dependencies that don't work on Win64.
168 ['target_arch!="x64"', { 163 ['target_arch!="x64"', {
169 'dependencies': [ 164 'dependencies': [
(...skipping 1069 matching lines...) Expand 10 before | Expand all | Expand 10 after
1239 # http://crbug.com/157234 1234 # http://crbug.com/157234
1240 #'../chrome/chrome.gyp:sync_integration_tests_run', 1235 #'../chrome/chrome.gyp:sync_integration_tests_run',
1241 '../chrome/chrome.gyp:unit_tests_run', 1236 '../chrome/chrome.gyp:unit_tests_run',
1242 '../net/net.gyp:net_unittests_run', 1237 '../net/net.gyp:net_unittests_run',
1243 ], 1238 ],
1244 }, # target_name: chromium_swarm_tests 1239 }, # target_name: chromium_swarm_tests
1245 ], 1240 ],
1246 }], 1241 }],
1247 ], # conditions 1242 ], # conditions
1248 } 1243 }
OLDNEW
« no previous file with comments | « base/base.gyp ('k') | build/build_config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698