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

Side by Side Diff: build/all.gyp

Issue 6125002: Allow the official target to be used for non-official builds.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 '../media/media.gyp:media_unittests', 384 '../media/media.gyp:media_unittests',
385 '../net/net.gyp:net_unittests', 385 '../net/net.gyp:net_unittests',
386 '../printing/printing.gyp:printing_unittests', 386 '../printing/printing.gyp:printing_unittests',
387 '../remoting/remoting.gyp:remoting_unittests', 387 '../remoting/remoting.gyp:remoting_unittests',
388 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests', 388 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests',
389 'temp_gyp/googleurl.gyp:googleurl_unittests', 389 'temp_gyp/googleurl.gyp:googleurl_unittests',
390 ], 390 ],
391 }, 391 },
392 ], # targets 392 ], # targets
393 'conditions': [ 393 'conditions': [
394 ['(branding=="Chrome" and buildtype=="Official")', { 394 ['branding=="Chrome"', {
395 'targets': [ 395 'targets': [
396 { 396 {
397 'target_name': 'chrome_official_builder', 397 'target_name': 'chrome_official_builder',
398 'type': 'none', 398 'type': 'none',
399 'dependencies': [ 399 'dependencies': [
400 '../chrome/app/locales/locales.gyp:*', 400 '../chrome/app/locales/locales.gyp:*',
401 '../chrome/chrome.gyp:crash_service', 401 '../chrome/chrome.gyp:crash_service',
402 '../chrome/chrome.gyp:page_cycler_tests', 402 '../chrome/chrome.gyp:page_cycler_tests',
403 '../chrome/chrome.gyp:policy_templates', 403 '../chrome/chrome.gyp:policy_templates',
404 '../chrome/chrome.gyp:pyautolib', 404 '../chrome/chrome.gyp:pyautolib',
405 '../chrome/chrome.gyp:reliability_tests', 405 '../chrome/chrome.gyp:reliability_tests',
406 '../chrome/chrome.gyp:startup_tests', 406 '../chrome/chrome.gyp:startup_tests',
407 '../chrome/chrome.gyp:automated_ui_tests', 407 '../chrome/chrome.gyp:automated_ui_tests',
408 '../chrome/installer/mini_installer.gyp:mini_installer', 408 '../chrome/installer/mini_installer.gyp:mini_installer',
409 '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests', 409 '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
410 '../chrome_frame/chrome_frame.gyp:npchrome_frame', 410 '../chrome_frame/chrome_frame.gyp:npchrome_frame',
411 '../courgette/courgette.gyp:courgette', 411 '../courgette/courgette.gyp:courgette',
412 '../pdf/pdf.gyp:pdf',
413 '../third_party/adobe/flash/flash_player.gyp:flash_player', 412 '../third_party/adobe/flash/flash_player.gyp:flash_player',
414 '../webkit/webkit.gyp:test_shell', 413 '../webkit/webkit.gyp:test_shell',
415 ], 414 ],
415 'conditions': [
416 ['internal_pdf', {
417 'dependencies': [
418 '../pdf/pdf.gyp:pdf',
419 ],
420 }], # internal_pdf
421 ]
416 }, 422 },
417 ], # targets 423 ], # targets
418 }], # (branding=="Chrome" and buildtype=="Official") 424 }], # branding=="Chrome"
419 ], # conditions 425 ], # conditions
420 }], # OS="win" 426 }], # OS="win"
421 ['chromeos==1', { 427 ['chromeos==1', {
422 'targets': [ 428 'targets': [
423 { 429 {
424 'target_name': 'chromeos_builder', 430 'target_name': 'chromeos_builder',
425 'type': 'none', 431 'type': 'none',
426 'sources': [ 432 'sources': [
427 # TODO(bradnelson): This is here to work around gyp issue 137. 433 # TODO(bradnelson): This is here to work around gyp issue 137.
428 # Remove this sources list when that issue has been fixed. 434 # Remove this sources list when that issue has been fixed.
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 ], # targets 466 ], # targets
461 }], # "chromeos==1" 467 }], # "chromeos==1"
462 ], # conditions 468 ], # conditions
463 } 469 }
464 470
465 # Local Variables: 471 # Local Variables:
466 # tab-width:2 472 # tab-width:2
467 # indent-tabs-mode:nil 473 # indent-tabs-mode:nil
468 # End: 474 # End:
469 # vim: set expandtab tabstop=2 shiftwidth=2: 475 # vim: set expandtab tabstop=2 shiftwidth=2:
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