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

Side by Side Diff: build/linux/system.gyp

Issue 153893011: Fix interactive_ui_tests dependency on xtst (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort Created 6 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 | « no previous file | chrome/chrome_tests.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 'variables': { 6 'variables': {
7 'conditions': [ 7 'conditions': [
8 ['sysroot!=""', { 8 ['sysroot!=""', {
9 'pkg-config': './pkg-config-wrapper "<(sysroot)" "<(target_arch)"', 9 'pkg-config': './pkg-config-wrapper "<(sysroot)" "<(target_arch)"',
10 }, { 10 }, {
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 'process_outputs_as_sources': 1, 289 'process_outputs_as_sources': 1,
290 }, 290 },
291 ], 291 ],
292 }], 292 }],
293 ], 293 ],
294 }, 294 },
295 { 295 {
296 'target_name': 'glib', 296 'target_name': 'glib',
297 'type': 'none', 297 'type': 'none',
298 'toolsets': ['host', 'target'], 298 'toolsets': ['host', 'target'],
299 'dependencies': [
300 'xtst'
301 ],
302 'variables': { 299 'variables': {
303 'glib_packages': 'glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0', 300 'glib_packages': 'glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0',
304 }, 301 },
305 'conditions': [ 302 'conditions': [
306 ['_toolset=="target"', { 303 ['_toolset=="target"', {
307 'direct_dependent_settings': { 304 'direct_dependent_settings': {
308 'cflags': [ 305 'cflags': [
309 '<!@(<(pkg-config) --cflags <(glib_packages))', 306 '<!@(<(pkg-config) --cflags <(glib_packages))',
310 ], 307 ],
311 }, 308 },
(...skipping 685 matching lines...) Expand 10 before | Expand all | Expand 10 after
997 ], 994 ],
998 'libraries': [ 995 'libraries': [
999 '<!@(pkg-config --libs-only-l xtst)', 996 '<!@(pkg-config --libs-only-l xtst)',
1000 ], 997 ],
1001 }, 998 },
1002 }] 999 }]
1003 ] 1000 ]
1004 } 1001 }
1005 ], 1002 ],
1006 } 1003 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698