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

Side by Side Diff: build/all.gyp

Issue 10386181: Fix remoting_unittests compilation with aura (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 | remoting/host/continue_window_gtk.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 532 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 ['use_aura==1', { 543 ['use_aura==1', {
544 'targets': [ 544 'targets': [
545 { 545 {
546 'target_name': 'aura_builder', 546 'target_name': 'aura_builder',
547 'type': 'none', 547 'type': 'none',
548 'dependencies': [ 548 'dependencies': [
549 '../chrome/chrome.gyp:browser_tests', 549 '../chrome/chrome.gyp:browser_tests',
550 '../chrome/chrome.gyp:chrome', 550 '../chrome/chrome.gyp:chrome',
551 '../chrome/chrome.gyp:interactive_ui_tests', 551 '../chrome/chrome.gyp:interactive_ui_tests',
552 '../chrome/chrome.gyp:unit_tests', 552 '../chrome/chrome.gyp:unit_tests',
553 '../remoting/remoting.gyp:remoting_unittests',
553 '../ui/aura/aura.gyp:*', 554 '../ui/aura/aura.gyp:*',
554 '../ui/compositor/compositor.gyp:*', 555 '../ui/compositor/compositor.gyp:*',
555 '../ui/ui.gyp:gfx_unittests', 556 '../ui/ui.gyp:gfx_unittests',
556 '../ui/views/views.gyp:views', 557 '../ui/views/views.gyp:views',
557 '../ui/views/views.gyp:views_unittests', 558 '../ui/views/views.gyp:views_unittests',
558 '../webkit/webkit.gyp:pull_in_webkit_unit_tests', 559 '../webkit/webkit.gyp:pull_in_webkit_unit_tests',
559 ], 560 ],
560 'conditions': [ 561 'conditions': [
561 ['OS=="win"', { 562 ['OS=="win"', {
562 # Remove this when we have the real compositor. 563 # Remove this when we have the real compositor.
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
599 'dependencies': [ 600 'dependencies': [
600 '../chromeos/chromeos.gyp:chromeos_unittests', 601 '../chromeos/chromeos.gyp:chromeos_unittests',
601 ], 602 ],
602 }], 603 }],
603 ], 604 ],
604 }, 605 },
605 ], # targets 606 ], # targets
606 }], # "use_aura==1" 607 }], # "use_aura==1"
607 ], # conditions 608 ], # conditions
608 } 609 }
OLDNEW
« no previous file with comments | « no previous file | remoting/host/continue_window_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698