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

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

Issue 11235031: Remove the dependency to dbus-glib from from the remaining places. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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 | « build/install-build-deps.sh ('k') | chrome/chrome_browser_chromeos.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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 '<!@(<(pkg-config) --libs-only-L --libs-only-other gdk-2.0)', 105 '<!@(<(pkg-config) --libs-only-L --libs-only-other gdk-2.0)',
106 ], 106 ],
107 'libraries': [ 107 'libraries': [
108 '<!@(<(pkg-config) --libs-only-l gdk-2.0)', 108 '<!@(<(pkg-config) --libs-only-l gdk-2.0)',
109 ], 109 ],
110 }, 110 },
111 }], 111 }],
112 ], 112 ],
113 }, 113 },
114 ], # targets 114 ], # targets
115 }, { # chromeos==1 115 }],
116 'targets': [
117 {
118 # TODO(satorux): Remove this once dbus-glib clients are gone.
119 'target_name': 'dbus-glib',
120 'type': 'none',
121 'direct_dependent_settings': {
122 'cflags': [
123 '<!@(<(pkg-config) --cflags dbus-glib-1)',
124 ],
125 },
126 'link_settings': {
127 'ldflags': [
128 '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-glib-1)',
129 ],
130 'libraries': [
131 '<!@(<(pkg-config) --libs-only-l dbus-glib-1)',
132 ],
133 },
134 },
135 ],
136 }]
137 ], # conditions 116 ], # conditions
138 'targets': [ 117 'targets': [
139 { 118 {
140 'target_name': 'ssl', 119 'target_name': 'ssl',
141 'type': 'none', 120 'type': 'none',
142 'conditions': [ 121 'conditions': [
143 ['_toolset=="target"', { 122 ['_toolset=="target"', {
144 'conditions': [ 123 'conditions': [
145 ['use_openssl==1', { 124 ['use_openssl==1', {
146 'dependencies': [ 125 'dependencies': [
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
628 ], 607 ],
629 'libraries': [ 608 'libraries': [
630 '<!@(<(pkg-config) --libs-only-l libudev)', 609 '<!@(<(pkg-config) --libs-only-l libudev)',
631 ], 610 ],
632 }, 611 },
633 }], 612 }],
634 ], 613 ],
635 }, 614 },
636 ], 615 ],
637 } 616 }
OLDNEW
« no previous file with comments | « build/install-build-deps.sh ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698