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

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

Issue 3380004: Linux: make compile-time dependency on gnome-keyring optional. (Closed)
Patch Set: fixes Created 10 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
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/profile_impl.cc » ('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) 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 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 'conditions': [ 261 'conditions': [
262 ['chromeos==0', { 262 ['use_gnome_keyring==1', {
Evan Martin 2010/09/15 21:28:27 Is this still necessary? Won't this target be unu
Paweł Hajdan Jr. 2010/09/15 21:56:03 I was getting errors without this if gnome-keyring
263 'direct_dependent_settings': { 263 'direct_dependent_settings': {
264 'cflags': [ 264 'cflags': [
265 '<!@(<(pkg-config) --cflags gnome-keyring-1)', 265 '<!@(<(pkg-config) --cflags gnome-keyring-1)',
266 ], 266 ],
267 'defines': [
268 'USE_GNOME_KEYRING',
269 ],
267 'conditions': [ 270 'conditions': [
268 ['linux_link_gnome_keyring==0', { 271 ['linux_link_gnome_keyring==0', {
269 'defines': ['DLOPEN_GNOME_KEYRING'], 272 'defines': ['DLOPEN_GNOME_KEYRING'],
270 }], 273 }],
271 ], 274 ],
272 }, 275 },
273 'conditions': [ 276 'conditions': [
274 ['linux_link_gnome_keyring!=0', { 277 ['linux_link_gnome_keyring!=0', {
275 'link_settings': { 278 'link_settings': {
276 'ldflags': [ 279 'ldflags': [
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 }, 321 },
319 }, 322 },
320 ], 323 ],
321 } 324 }
322 325
323 # Local Variables: 326 # Local Variables:
324 # tab-width:2 327 # tab-width:2
325 # indent-tabs-mode:nil 328 # indent-tabs-mode:nil
326 # End: 329 # End:
327 # vim: set expandtab tabstop=2 shiftwidth=2: 330 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698