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

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

Issue 7970010: linux: convert more dependencies to 'settings' (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 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 | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'conditions': [ 6 'conditions': [
7 ['sysroot!=""', { 7 ['sysroot!=""', {
8 'variables': { 8 'variables': {
9 'pkg-config': './pkg-config-wrapper "<(sysroot)"', 9 'pkg-config': './pkg-config-wrapper "<(sysroot)"',
10 }, 10 },
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 '-ldl', 265 '-ldl',
266 ], 266 ],
267 }], 267 }],
268 ], 268 ],
269 }, 269 },
270 }], 270 }],
271 ], 271 ],
272 }, 272 },
273 { 273 {
274 'target_name': 'x11', 274 'target_name': 'x11',
275 'type': 'settings', 275 'type': 'none',
276 'toolsets': ['host', 'target'], 276 'toolsets': ['host', 'target'],
277 'conditions': [ 277 'conditions': [
278 ['_toolset=="target"', { 278 ['_toolset=="target"', {
279 'direct_dependent_settings': { 279 'direct_dependent_settings': {
280 'cflags': [ 280 'cflags': [
281 '<!@(<(pkg-config) --cflags x11)', 281 '<!@(<(pkg-config) --cflags x11)',
282 ], 282 ],
283 }, 283 },
284 'link_settings': { 284 'link_settings': {
285 'ldflags': [ 285 'ldflags': [
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 }], 501 }],
502 ['chromeos==1', { 502 ['chromeos==1', {
503 'link_settings': { 503 'link_settings': {
504 'libraries': [ '-lXtst' ] 504 'libraries': [ '-lXtst' ]
505 } 505 }
506 }], 506 }],
507 ], 507 ],
508 }, 508 },
509 { 509 {
510 'target_name': 'pangocairo', 510 'target_name': 'pangocairo',
511 'type': 'settings', 511 'type': 'none',
512 'toolsets': ['host', 'target'], 512 'toolsets': ['host', 'target'],
513 'conditions': [ 513 'conditions': [
514 ['_toolset=="target"', { 514 ['_toolset=="target"', {
515 'direct_dependent_settings': { 515 'direct_dependent_settings': {
516 'cflags': [ 516 'cflags': [
517 '<!@(<(pkg-config) --cflags pangocairo)', 517 '<!@(<(pkg-config) --cflags pangocairo)',
518 ], 518 ],
519 }, 519 },
520 'link_settings': { 520 'link_settings': {
521 'ldflags': [ 521 'ldflags': [
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 ], 595 ],
596 'libraries': [ 596 'libraries': [
597 '<!@(<(pkg-config) --libs-only-l wayland-client wayland-egl xkbcom mon)', 597 '<!@(<(pkg-config) --libs-only-l wayland-client wayland-egl xkbcom mon)',
598 ], 598 ],
599 }, 599 },
600 }], 600 }],
601 ], 601 ],
602 }, 602 },
603 ], 603 ],
604 } 604 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698