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

Side by Side Diff: trunk/src/ui/views/views.gyp

Issue 15838015: Revert 202787 "Remove unnecessary ui::CompositorTestSupport" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 6 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 | « trunk/src/ui/views/run_all_unittests.cc ('k') | trunk/src/webkit/support/webkit_support.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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 }, 7 },
8 'target_defaults': { 8 'target_defaults': {
9 'conditions': [ 9 'conditions': [
10 ['use_aura==1', { 10 ['use_aura==1', {
(...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 # unrelated things like v8, sqlite nss...). 652 # unrelated things like v8, sqlite nss...).
653 '../../chrome/chrome_resources.gyp:packed_resources', 653 '../../chrome/chrome_resources.gyp:packed_resources',
654 '../../build/temp_gyp/googleurl.gyp:googleurl', 654 '../../build/temp_gyp/googleurl.gyp:googleurl',
655 '../../skia/skia.gyp:skia', 655 '../../skia/skia.gyp:skia',
656 '../../testing/gmock.gyp:gmock', 656 '../../testing/gmock.gyp:gmock',
657 '../../testing/gtest.gyp:gtest', 657 '../../testing/gtest.gyp:gtest',
658 '../../third_party/icu/icu.gyp:icui18n', 658 '../../third_party/icu/icu.gyp:icui18n',
659 '../../third_party/icu/icu.gyp:icuuc', 659 '../../third_party/icu/icu.gyp:icuuc',
660 '../base/strings/ui_strings.gyp:ui_strings', 660 '../base/strings/ui_strings.gyp:ui_strings',
661 '../compositor/compositor.gyp:compositor', 661 '../compositor/compositor.gyp:compositor',
662 '../compositor/compositor.gyp:compositor_test_support',
662 '../ui.gyp:ui', 663 '../ui.gyp:ui',
663 '../ui.gyp:ui_resources', 664 '../ui.gyp:ui_resources',
664 '../ui.gyp:ui_test_support', 665 '../ui.gyp:ui_test_support',
665 'views', 666 'views',
666 'views_test_support', 667 'views_test_support',
667 ], 668 ],
668 'include_dirs': [ 669 'include_dirs': [
669 '..', 670 '..',
670 ], 671 ],
671 'sources': [ 672 'sources': [
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
990 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 991 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
991 }, 992 },
992 }, 993 },
993 'dependencies': [ 994 'dependencies': [
994 '../../sandbox/sandbox.gyp:sandbox', 995 '../../sandbox/sandbox.gyp:sandbox',
995 ], 996 ],
996 }], 997 }],
997 ['use_aura==1', { 998 ['use_aura==1', {
998 'dependencies': [ 999 'dependencies': [
999 '../compositor/compositor.gyp:compositor', 1000 '../compositor/compositor.gyp:compositor',
1001 '../compositor/compositor.gyp:compositor_test_support',
1000 ], 1002 ],
1001 }], 1003 }],
1002 ['OS=="win"', { 1004 ['OS=="win"', {
1003 'sources/': [ 1005 'sources/': [
1004 # This is needed because the aura rule strips it from the default 1006 # This is needed because the aura rule strips it from the default
1005 # sources list. 1007 # sources list.
1006 ['include', '^../../content/app/startup_helper_win.cc'], 1008 ['include', '^../../content/app/startup_helper_win.cc'],
1007 ], 1009 ],
1008 }], 1010 }],
1009 ], 1011 ],
1010 }, # target_name: views_examples_with_content_exe 1012 }, # target_name: views_examples_with_content_exe
1011 ], 1013 ],
1012 } 1014 }
OLDNEW
« no previous file with comments | « trunk/src/ui/views/run_all_unittests.cc ('k') | trunk/src/webkit/support/webkit_support.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698