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

Side by Side Diff: trunk/src/build/all.gyp

Issue 288013002: Revert 270471 "ozone: Add egltest platform" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | trunk/src/build/common.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 '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 1185 matching lines...) Expand 10 before | Expand all | Expand 10 after
1196 '../sync/sync.gyp:sync_unit_tests', 1196 '../sync/sync.gyp:sync_unit_tests',
1197 ], 1197 ],
1198 }], 1198 }],
1199 ['chromeos==1', { 1199 ['chromeos==1', {
1200 'dependencies': [ 1200 'dependencies': [
1201 '../chromeos/chromeos.gyp:chromeos_unittests', 1201 '../chromeos/chromeos.gyp:chromeos_unittests',
1202 '../athena/main/athena_main.gyp:*', 1202 '../athena/main/athena_main.gyp:*',
1203 ], 1203 ],
1204 }], 1204 }],
1205 ['use_ozone==1', { 1205 ['use_ozone==1', {
1206 'dependencies': [
1207 '../ui/ozone/ozone.gyp:*',
1208 ],
1209 'dependencies!': [ 1206 'dependencies!': [
1210 '../chrome/chrome.gyp:interactive_ui_tests', # crbug.com/362166 1207 '../chrome/chrome.gyp:interactive_ui_tests', # crbug.com/362166
1211 ], 1208 ],
1212 }], 1209 }],
1213 ], 1210 ],
1214 }, 1211 },
1215 ], # targets 1212 ], # targets
1216 }, { 1213 }, {
1217 'conditions': [ 1214 'conditions': [
1218 ['OS=="linux"', { 1215 ['OS=="linux"', {
(...skipping 22 matching lines...) Expand all
1241 # http://crbug.com/157234 1238 # http://crbug.com/157234
1242 #'../chrome/chrome.gyp:sync_integration_tests_run', 1239 #'../chrome/chrome.gyp:sync_integration_tests_run',
1243 '../chrome/chrome.gyp:unit_tests_run', 1240 '../chrome/chrome.gyp:unit_tests_run',
1244 '../net/net.gyp:net_unittests_run', 1241 '../net/net.gyp:net_unittests_run',
1245 ], 1242 ],
1246 }, # target_name: chromium_swarm_tests 1243 }, # target_name: chromium_swarm_tests
1247 ], 1244 ],
1248 }], 1245 }],
1249 ], # conditions 1246 ], # conditions
1250 } 1247 }
OLDNEW
« no previous file with comments | « no previous file | trunk/src/build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698