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

Side by Side Diff: build/all.gyp

Issue 131453013: GTK build fix: Have a dummy aura_builder target even with use_aura=0. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | no next file » | 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 1181 matching lines...) Expand 10 before | Expand all | Expand 10 after
1192 ], 1192 ],
1193 }], 1193 }],
1194 ['chromeos==1', { 1194 ['chromeos==1', {
1195 'dependencies': [ 1195 'dependencies': [
1196 '../chromeos/chromeos.gyp:chromeos_unittests', 1196 '../chromeos/chromeos.gyp:chromeos_unittests',
1197 ], 1197 ],
1198 }], 1198 }],
1199 ], 1199 ],
1200 }, 1200 },
1201 ], # targets 1201 ], # targets
1202 }, {
1203 # TODO(thakis): Remove this once the linux gtk bot no longer references
1204 # it (probably after the first aura release on linux), see r249162
1205 'targets': [
1206 {
1207 'target_name': 'aura_builder',
1208 'type': 'none',
1209 },
1210 ], # targets
1202 }], # "use_aura==1" 1211 }], # "use_aura==1"
1203 ['test_isolation_mode != "noop"', { 1212 ['test_isolation_mode != "noop"', {
1204 'targets': [ 1213 'targets': [
1205 { 1214 {
1206 'target_name': 'chromium_swarm_tests', 1215 'target_name': 'chromium_swarm_tests',
1207 'type': 'none', 1216 'type': 'none',
1208 'dependencies': [ 1217 'dependencies': [
1209 '../base/base.gyp:base_unittests_run', 1218 '../base/base.gyp:base_unittests_run',
1210 '../chrome/chrome.gyp:browser_tests_run', 1219 '../chrome/chrome.gyp:browser_tests_run',
1211 '../chrome/chrome.gyp:interactive_ui_tests_run', 1220 '../chrome/chrome.gyp:interactive_ui_tests_run',
1212 '../chrome/chrome.gyp:sync_integration_tests_run', 1221 '../chrome/chrome.gyp:sync_integration_tests_run',
1213 '../chrome/chrome.gyp:unit_tests_run', 1222 '../chrome/chrome.gyp:unit_tests_run',
1214 '../net/net.gyp:net_unittests_run', 1223 '../net/net.gyp:net_unittests_run',
1215 ], 1224 ],
1216 }, # target_name: chromium_swarm_tests 1225 }, # target_name: chromium_swarm_tests
1217 ], 1226 ],
1218 }], 1227 }],
1219 ], # conditions 1228 ], # conditions
1220 } 1229 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698