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

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

Issue 2729010: Fix chrome build inside the Chromium OS build chroot. (Closed)
Patch Set: Created 10 years, 6 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
« 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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 'link_settings': { 251 'link_settings': {
252 'libraries': [ 252 'libraries': [
253 '-lselinux', 253 '-lselinux',
254 ], 254 ],
255 }, 255 },
256 }]] 256 }]]
257 }, 257 },
258 { 258 {
259 'target_name': 'gnome-keyring', 259 'target_name': 'gnome-keyring',
260 'type': 'settings', 260 'type': 'settings',
261 'direct_dependent_settings': {
262 'cflags': [
263 '<!@(<(pkg-config) --cflags gnome-keyring-1)',
264 ],
265 'conditions': [
266 ['linux_link_gnome_keyring==0', {
267 'defines': ['DLOPEN_GNOME_KEYRING'],
268 }],
269 ],
270 },
271 'conditions': [ 261 'conditions': [
272 ['linux_link_gnome_keyring!=0', { 262 ['chromeos==0', {
273 'link_settings': { 263 'direct_dependent_settings': {
274 'ldflags': [ 264 'cflags': [
275 '<!@(<(pkg-config) --libs-only-L --libs-only-other gnome-keyring-1 )', 265 '<!@(<(pkg-config) --cflags gnome-keyring-1)',
276 ], 266 ],
277 'libraries': [ 267 'conditions': [
278 '<!@(<(pkg-config) --libs-only-l gnome-keyring-1)', 268 ['linux_link_gnome_keyring==0', {
269 'defines': ['DLOPEN_GNOME_KEYRING'],
270 }],
279 ], 271 ],
280 }, 272 },
281 }, { 273 'conditions': [
282 'link_settings': { 274 ['linux_link_gnome_keyring!=0', {
283 'libraries': [ 275 'link_settings': {
284 '-ldl', 276 'ldflags': [
285 ], 277 '<!@(<(pkg-config) --libs-only-L --libs-only-other gnome-keyri ng-1)',
286 }, 278 ],
279 'libraries': [
280 '<!@(<(pkg-config) --libs-only-l gnome-keyring-1)',
281 ],
282 },
283 }, {
284 'link_settings': {
285 'libraries': [
286 '-ldl',
287 ],
288 },
289 }],
290 ],
287 }], 291 }],
288 ], 292 ],
289 }, 293 },
290 { 294 {
291 'target_name': 'dbus-glib', 295 'target_name': 'dbus-glib',
292 'type': 'settings', 296 'type': 'settings',
293 'direct_dependent_settings': { 297 'direct_dependent_settings': {
294 'cflags': [ 298 'cflags': [
295 '<!@(<(pkg-config) --cflags dbus-glib-1)', 299 '<!@(<(pkg-config) --cflags dbus-glib-1)',
296 ], 300 ],
297 }, 301 },
298 'link_settings': { 302 'link_settings': {
299 'ldflags': [ 303 'ldflags': [
300 '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-glib-1)', 304 '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-glib-1)',
301 ], 305 ],
302 'libraries': [ 306 'libraries': [
303 '<!@(<(pkg-config) --libs-only-l dbus-glib-1)', 307 '<!@(<(pkg-config) --libs-only-l dbus-glib-1)',
304 ], 308 ],
305 }, 309 },
306 }, 310 },
307 ], 311 ],
308 } 312 }
309 313
310 # Local Variables: 314 # Local Variables:
311 # tab-width:2 315 # tab-width:2
312 # indent-tabs-mode:nil 316 # indent-tabs-mode:nil
313 # End: 317 # End:
314 # vim: set expandtab tabstop=2 shiftwidth=2: 318 # vim: set expandtab tabstop=2 shiftwidth=2:
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