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

Side by Side Diff: build/all.gyp

Issue 10260033: Build fixes to get use_aura && !use_ash to build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | chrome/browser/ui/views/frame/browser_view.cc » ('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 543 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 ], # targets 554 ], # targets
555 }], # branding=="Chrome" 555 }], # branding=="Chrome"
556 ], # conditions 556 ], # conditions
557 }], # OS="win" 557 }], # OS="win"
558 ['use_aura==1', { 558 ['use_aura==1', {
559 'targets': [ 559 'targets': [
560 { 560 {
561 'target_name': 'aura_builder', 561 'target_name': 'aura_builder',
562 'type': 'none', 562 'type': 'none',
563 'dependencies': [ 563 'dependencies': [
564 '../chrome/chrome.gyp:browser_tests',
564 '../chrome/chrome.gyp:chrome', 565 '../chrome/chrome.gyp:chrome',
566 '../chrome/chrome.gyp:interactive_ui_tests',
567 '../chrome/chrome.gyp:ui_tests',
565 '../chrome/chrome.gyp:unit_tests', 568 '../chrome/chrome.gyp:unit_tests',
566 '../chrome/chrome.gyp:ui_tests',
567 '../ui/aura/aura.gyp:*', 569 '../ui/aura/aura.gyp:*',
568 '../ui/gfx/compositor/compositor.gyp:*', 570 '../ui/gfx/compositor/compositor.gyp:*',
569 '../ui/ui.gyp:gfx_unittests', 571 '../ui/ui.gyp:gfx_unittests',
570 '../ui/views/views.gyp:views', 572 '../ui/views/views.gyp:views',
571 '../ui/views/views.gyp:views_unittests', 573 '../ui/views/views.gyp:views_unittests',
572 '../webkit/webkit.gyp:pull_in_webkit_unit_tests', 574 '../webkit/webkit.gyp:pull_in_webkit_unit_tests',
573 ], 575 ],
574 'conditions': [ 576 'conditions': [
575 ['OS=="win"', { 577 ['OS=="win"', {
576 # Remove this when we have the real compositor. 578 # Remove this when we have the real compositor.
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
614 'dependencies': [ 616 'dependencies': [
615 '../chromeos/chromeos.gyp:chromeos_unittests', 617 '../chromeos/chromeos.gyp:chromeos_unittests',
616 ], 618 ],
617 }], 619 }],
618 ], 620 ],
619 }, 621 },
620 ], # targets 622 ], # targets
621 }], # "use_aura==1" 623 }], # "use_aura==1"
622 ], # conditions 624 ], # conditions
623 } 625 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698