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

Side by Side Diff: build/all.gyp

Issue 239993009: Revert accidental dartium code push (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « android_webview/common/aw_content_client.cc ('k') | 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 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 'conditions': [ 236 'conditions': [
237 ['OS=="win" and fastbuild==0 and target_arch=="ia32" and ' 237 ['OS=="win" and fastbuild==0 and target_arch=="ia32" and '
238 '(syzyasan==1 or syzygy_optimize==1)', { 238 '(syzyasan==1 or syzygy_optimize==1)', {
239 'dependencies': [ 239 'dependencies': [
240 '../chrome/installer/mini_installer_syzygy.gyp:*', 240 '../chrome/installer/mini_installer_syzygy.gyp:*',
241 ], 241 ],
242 }], 242 }],
243 ], 243 ],
244 }, # target_name: All_syzygy 244 }, # target_name: All_syzygy
245 { 245 {
246 'target_name': 'dartium_builder',
247 'type': 'none',
248 'dependencies': [
249 '../dart/pkg/pkg.gyp:pkg_packages',
250 # '../webkit/webkit.gyp:pull_in_webkit_unit_tests',
251 '../chrome/chrome.gyp:chrome',
252 '../chrome/chrome.gyp:chromedriver',
253 '../content/content_shell_and_tests.gyp:content_shell',
254 'blink_tests',
255 ],
256 },
257 {
258 # Note: Android uses android_builder_tests below. 246 # Note: Android uses android_builder_tests below.
259 # TODO: Consider merging that with this target. 247 # TODO: Consider merging that with this target.
260 'target_name': 'chromium_builder_tests', 248 'target_name': 'chromium_builder_tests',
261 'type': 'none', 249 'type': 'none',
262 'dependencies': [ 250 'dependencies': [
263 '../base/base.gyp:base_unittests', 251 '../base/base.gyp:base_unittests',
264 '../components/components_tests.gyp:components_unittests', 252 '../components/components_tests.gyp:components_unittests',
265 '../crypto/crypto.gyp:crypto_unittests', 253 '../crypto/crypto.gyp:crypto_unittests',
266 '../net/net.gyp:net_unittests', 254 '../net/net.gyp:net_unittests',
267 '../sql/sql.gyp:sql_unittests', 255 '../sql/sql.gyp:sql_unittests',
(...skipping 983 matching lines...) Expand 10 before | Expand all | Expand 10 after
1251 # http://crbug.com/157234 1239 # http://crbug.com/157234
1252 #'../chrome/chrome.gyp:sync_integration_tests_run', 1240 #'../chrome/chrome.gyp:sync_integration_tests_run',
1253 '../chrome/chrome.gyp:unit_tests_run', 1241 '../chrome/chrome.gyp:unit_tests_run',
1254 '../net/net.gyp:net_unittests_run', 1242 '../net/net.gyp:net_unittests_run',
1255 ], 1243 ],
1256 }, # target_name: chromium_swarm_tests 1244 }, # target_name: chromium_swarm_tests
1257 ], 1245 ],
1258 }], 1246 }],
1259 ], # conditions 1247 ], # conditions
1260 } 1248 }
OLDNEW
« no previous file with comments | « android_webview/common/aw_content_client.cc ('k') | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698