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

Unified Diff: build/linux/system.gyp

Issue 10977036: Linux: move dbus-glib target to chromeos-specific section, (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/linux/system.gyp
===================================================================
--- build/linux/system.gyp (revision 158796)
+++ build/linux/system.gyp (working copy)
@@ -112,7 +112,28 @@
],
},
], # targets
- }] # chromeos==0
+ }, { # chromeos==1
+ 'targets': [
+ {
+ # TODO(satorux): Remove this once dbus-glib clients are gone.
+ 'target_name': 'dbus-glib',
+ 'type': 'none',
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(<(pkg-config) --cflags dbus-glib-1)',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-glib-1)',
+ ],
+ 'libraries': [
+ '<!@(<(pkg-config) --libs-only-l dbus-glib-1)',
+ ],
+ },
+ },
+ ],
+ }]
], # conditions
'targets': [
{
@@ -477,24 +498,6 @@
},
},
{
- # TODO(satorux): Remove this once dbus-glib clients are gone.
- 'target_name': 'dbus-glib',
- 'type': 'none',
- 'direct_dependent_settings': {
- 'cflags': [
- '<!@(<(pkg-config) --cflags dbus-glib-1)',
- ],
- },
- 'link_settings': {
- 'ldflags': [
- '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-glib-1)',
- ],
- 'libraries': [
- '<!@(<(pkg-config) --libs-only-l dbus-glib-1)',
- ],
- },
- },
- {
'target_name': 'glib',
'type': 'none',
'toolsets': ['host', 'target'],
« 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