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

Side by Side Diff: ui/ui_unittests.gypi

Issue 12213044: Depend on xdisplaycheck when use_x11==1, not when toolkit_uses_gtk==1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Depend on xdisplaycheck when use_x11==1, not when toolkit_uses_gtk==1 Created 7 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 | « chrome/chrome_tests_unit.gypi ('k') | webkit/tools/test_shell/test_shell.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': 'ui_test_support', 8 'target_name': 'ui_test_support',
9 'type': 'static_library', 9 'type': 'static_library',
10 'dependencies': [ 10 'dependencies': [
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 ], 214 ],
215 }], 215 }],
216 ['use_glib == 1 or OS == "ios"', { 216 ['use_glib == 1 or OS == "ios"', {
217 'dependencies': [ 217 'dependencies': [
218 'base/strings/ui_strings.gyp:ui_unittest_strings', 218 'base/strings/ui_strings.gyp:ui_unittest_strings',
219 ], 219 ],
220 }], 220 }],
221 ['use_glib == 1', { 221 ['use_glib == 1', {
222 'dependencies': [ 222 'dependencies': [
223 '../build/linux/system.gyp:pangocairo', 223 '../build/linux/system.gyp:pangocairo',
224 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
225 ], 224 ],
226 'conditions': [ 225 'conditions': [
227 ['linux_use_tcmalloc==1', { 226 ['linux_use_tcmalloc==1', {
228 'dependencies': [ 227 'dependencies': [
229 '../base/allocator/allocator.gyp:allocator', 228 '../base/allocator/allocator.gyp:allocator',
230 ], 229 ],
231 }], 230 }],
232 ['toolkit_views==1', { 231 ['toolkit_views==1', {
233 'sources!': [ 232 'sources!': [
234 'browser/ui/gtk/gtk_expanded_container_unittest.cc', 233 'browser/ui/gtk/gtk_expanded_container_unittest.cc',
235 ], 234 ],
236 }], 235 }],
237 ], 236 ],
238 }], 237 }],
238 ['use_x11==1', {
239 'dependencies': [
240 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
241 ],
242 }],
239 ['toolkit_uses_gtk == 1', { 243 ['toolkit_uses_gtk == 1', {
240 'sources': [ 244 'sources': [
241 'base/dragdrop/gtk_dnd_util_unittest.cc', 245 'base/dragdrop/gtk_dnd_util_unittest.cc',
242 ], 246 ],
243 'dependencies': [ 247 'dependencies': [
244 '../build/linux/system.gyp:gtk', 248 '../build/linux/system.gyp:gtk',
245 ], 249 ],
246 }], 250 }],
247 ['OS=="android" or OS=="ios"', { 251 ['OS=="android" or OS=="ios"', {
248 'sources!': [ 252 'sources!': [
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 'variables': { 302 'variables': {
299 'test_suite_name': 'ui_unittests', 303 'test_suite_name': 'ui_unittests',
300 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)ui_unitte sts<(SHARED_LIB_SUFFIX)', 304 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)ui_unitte sts<(SHARED_LIB_SUFFIX)',
301 }, 305 },
302 'includes': [ '../build/apk_test.gypi' ], 306 'includes': [ '../build/apk_test.gypi' ],
303 }, 307 },
304 ], 308 ],
305 }], 309 }],
306 ], 310 ],
307 } 311 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | webkit/tools/test_shell/test_shell.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698