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

Side by Side Diff: content/content_tests.gypi

Issue 9141034: Always use webkit compositor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix shared build Created 8 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 | « chrome/chrome_dll.gypi ('k') | content/test/content_test_suite.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': 'test_support_content', 8 'target_name': 'test_support_content',
9 'type': 'static_library', 9 'type': 'static_library',
10 'defines!': ['CONTENT_IMPLEMENTATION'], 10 'defines!': ['CONTENT_IMPLEMENTATION'],
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 ['toolkit_uses_gtk == 1', { 128 ['toolkit_uses_gtk == 1', {
129 'dependencies': [ 129 'dependencies': [
130 '../build/linux/system.gyp:gtk', 130 '../build/linux/system.gyp:gtk',
131 ], 131 ],
132 }], 132 }],
133 ['use_glib == 1', { 133 ['use_glib == 1', {
134 'dependencies': [ 134 'dependencies': [
135 '../build/linux/system.gyp:glib', 135 '../build/linux/system.gyp:glib',
136 ], 136 ],
137 }], 137 }],
138 ['use_webkit_compositor==1', { 138 ['use_webkit_compositor==1 and views_compositor==1', {
139 'dependencies': [ 139 'dependencies': [
140 '../ui/gfx/compositor/compositor.gyp:compositor', 140 '../ui/gfx/compositor/compositor.gyp:compositor',
141 ], 141 ],
142 }, { 142 }, {
143 'dependencies': [ 143 'dependencies': [
144 '../ui/gfx/compositor/compositor.gyp:test_compositor', 144 '../ui/gfx/compositor/compositor.gyp:test_compositor',
145 ], 145 ],
146 }], 146 }],
147 ], 147 ],
148 }, 148 },
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 ], 462 ],
463 'sources': [ 463 'sources': [
464 'common/gpu/media/video_decode_accelerator_unittest.cc', 464 'common/gpu/media/video_decode_accelerator_unittest.cc',
465 ], 465 ],
466 } 466 }
467 ], 467 ],
468 }, 468 },
469 ], 469 ],
470 ], 470 ],
471 } 471 }
OLDNEW
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | content/test/content_test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698