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

Side by Side Diff: build/all.gyp

Issue 9315009: Enable Aura for all ChromeOS builds in Chromium. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updated target/ Created 8 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 | 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 '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 509 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 }, 520 },
521 ], # targets 521 ], # targets
522 }], # branding=="Chrome" 522 }], # branding=="Chrome"
523 ], # conditions 523 ], # conditions
524 }], # OS="win" 524 }], # OS="win"
525 ['chromeos==1', { 525 ['chromeos==1', {
526 'targets': [ 526 'targets': [
527 { 527 {
528 'target_name': 'chromeos_builder', 528 'target_name': 'chromeos_builder',
529 'type': 'none', 529 'type': 'none',
530 'sources': [
531 # TODO(bradnelson): This is here to work around gyp issue 137.
532 # Remove this sources list when that issue has been fixed.
533 'all.gyp',
534 ],
535 'dependencies': [ 530 'dependencies': [
531 '../ash/ash.gyp:ash_shell',
532 '../ash/ash.gyp:aura_shell_unittests',
536 '../base/base.gyp:base_unittests', 533 '../base/base.gyp:base_unittests',
537 '../chrome/chrome.gyp:browser_tests', 534 #'../chrome/chrome.gyp:browser_tests',
538 '../chrome/chrome.gyp:chrome', 535 '../chrome/chrome.gyp:chrome',
539 '../chrome/chrome.gyp:interactive_ui_tests', 536 #'../chrome/chrome.gyp:interactive_ui_tests',
540 '../chrome/chrome.gyp:performance_browser_tests', 537 #'../chrome/chrome.gyp:performance_browser_tests',
541 '../chrome/chrome.gyp:performance_ui_tests', 538 #'../chrome/chrome.gyp:performance_ui_tests',
542 '../chrome/chrome.gyp:safe_browsing_tests', 539 #'../chrome/chrome.gyp:safe_browsing_tests',
540 #'../chrome/chrome.gyp:sync_integration_tests',
543 '../chrome/chrome.gyp:sync_unit_tests', 541 '../chrome/chrome.gyp:sync_unit_tests',
544 '../chrome/chrome.gyp:sync_integration_tests',
545 '../chrome/chrome.gyp:ui_tests', 542 '../chrome/chrome.gyp:ui_tests',
546 '../chrome/chrome.gyp:unit_tests', 543 '../chrome/chrome.gyp:unit_tests',
547 '../content/content.gyp:content_browsertests', 544 #'../content/content.gyp:content_browsertests',
548 '../content/content.gyp:content_unittests', 545 '../content/content.gyp:content_unittests',
549 '../crypto/crypto.gyp:crypto_unittests', 546 #'../crypto/crypto.gyp:crypto_unittests',
550 '../dbus/dbus.gyp:dbus_unittests', 547 #'../dbus/dbus.gyp:dbus_unittests',
548 '../ipc/ipc.gyp:ipc_tests',
549 #'../jingle/jingle.gyp:jingle_unittests',
550 #'../media/media.gyp:ffmpeg_tests',
551 #'../media/media.gyp:media_unittests',
552 #'../net/net.gyp:net_unittests',
553 #'../printing/printing.gyp:printing_unittests',
554 #'../remoting/remoting.gyp:remoting_unittests',
555 '../sql/sql.gyp:sql_unittests',
556 #'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvali dation_unittests',
557 #'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_un ittests',
558 '../ui/aura/aura.gyp:*',
559 '../ui/gfx/compositor/compositor.gyp:*',
551 '../ui/ui.gyp:gfx_unittests', 560 '../ui/ui.gyp:gfx_unittests',
552 '../ipc/ipc.gyp:ipc_tests', 561 '../ui/views/views.gyp:views',
553 '../jingle/jingle.gyp:jingle_unittests',
554 '../media/media.gyp:ffmpeg_tests',
555 '../media/media.gyp:media_unittests',
556 '../net/net.gyp:net_unittests',
557 '../printing/printing.gyp:printing_unittests',
558 '../remoting/remoting.gyp:remoting_unittests',
559 '../sql/sql.gyp:sql_unittests',
560 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests',
561 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_uni ttests',
562 '../ui/views/views.gyp:views_unittests', 562 '../ui/views/views.gyp:views_unittests',
563 'temp_gyp/googleurl.gyp:googleurl_unittests', 563 '../webkit/webkit.gyp:pull_in_webkit_unit_tests',
564 #'temp_gyp/googleurl.gyp:googleurl_unittests',
564 ], 565 ],
565 }, 566 },
566 ], # targets 567 ], # targets
567 }], # "chromeos==1" 568 }], # "chromeos==1"
568 ['use_aura==1', { 569 ['use_aura==1', {
569 'targets': [ 570 'targets': [
570 { 571 {
571 'target_name': 'aura_builder', 572 'target_name': 'aura_builder',
572 'type': 'none', 573 'type': 'none',
573 'dependencies': [ 574 'dependencies': [
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 '../chrome/chrome.gyp:ui_tests', 617 '../chrome/chrome.gyp:ui_tests',
617 '../ui/views/views.gyp:views_unittests', 618 '../ui/views/views.gyp:views_unittests',
618 ], 619 ],
619 }], 620 }],
620 ], 621 ],
621 }, 622 },
622 ], # targets 623 ], # targets
623 }], # "use_aura==1" 624 }], # "use_aura==1"
624 ], # conditions 625 ], # conditions
625 } 626 }
OLDNEW
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698