| OLD | NEW |
| 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 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 253 ], | 253 ], |
| 254 }, | 254 }, |
| 255 'link_settings': { | 255 'link_settings': { |
| 256 'ldflags': [ | 256 'ldflags': [ |
| 257 '<!@(<(pkg-config) --libs-only-L --libs-only-other gio-2.0)', | 257 '<!@(<(pkg-config) --libs-only-L --libs-only-other gio-2.0)', |
| 258 ], | 258 ], |
| 259 'libraries': [ | 259 'libraries': [ |
| 260 '<!@(<(pkg-config) --libs-only-l gio-2.0)', | 260 '<!@(<(pkg-config) --libs-only-l gio-2.0)', |
| 261 ], | 261 ], |
| 262 'conditions': [ | 262 'conditions': [ |
| 263 ['linux_link_gsettings==0', { | 263 ['linux_link_gsettings==0 and OS=="linux"', { |
| 264 'libraries': [ | 264 'libraries': [ |
| 265 '-ldl', | 265 '-ldl', |
| 266 ], | 266 ], |
| 267 }], | 267 }], |
| 268 ], | 268 ], |
| 269 }, | 269 }, |
| 270 }], | 270 }], |
| 271 ], | 271 ], |
| 272 }, | 272 }, |
| 273 { | 273 { |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 380 ['linux_link_gnome_keyring!=0', { | 380 ['linux_link_gnome_keyring!=0', { |
| 381 'link_settings': { | 381 'link_settings': { |
| 382 'ldflags': [ | 382 'ldflags': [ |
| 383 '<!@(<(pkg-config) --libs-only-L --libs-only-other gnome-keyri
ng-1)', | 383 '<!@(<(pkg-config) --libs-only-L --libs-only-other gnome-keyri
ng-1)', |
| 384 ], | 384 ], |
| 385 'libraries': [ | 385 'libraries': [ |
| 386 '<!@(<(pkg-config) --libs-only-l gnome-keyring-1)', | 386 '<!@(<(pkg-config) --libs-only-l gnome-keyring-1)', |
| 387 ], | 387 ], |
| 388 }, | 388 }, |
| 389 }, { | 389 }, { |
| 390 'link_settings': { | 390 'conditions': [ |
| 391 'libraries': [ | 391 ['OS=="linux"', { |
| 392 '-ldl', | 392 'link_settings': { |
| 393 ], | 393 'libraries': [ |
| 394 }, | 394 '-ldl', |
| 395 ], |
| 396 }, |
| 397 }], |
| 398 ], |
| 395 }], | 399 }], |
| 396 ], | 400 ], |
| 397 }], | 401 }], |
| 398 ], | 402 ], |
| 399 }, | 403 }, |
| 400 { | 404 { |
| 401 # The unit tests use a few convenience functions from the GNOME | 405 # The unit tests use a few convenience functions from the GNOME |
| 402 # Keyring library directly. We ignore linux_link_gnome_keyring and | 406 # Keyring library directly. We ignore linux_link_gnome_keyring and |
| 403 # link directly in this version of the target to allow this. | 407 # link directly in this version of the target to allow this. |
| 404 # *** Do not use this target in the main binary! *** | 408 # *** Do not use this target in the main binary! *** |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 595 ], | 599 ], |
| 596 'libraries': [ | 600 'libraries': [ |
| 597 '<!@(<(pkg-config) --libs-only-l wayland-client wayland-egl xkbcom
mon)', | 601 '<!@(<(pkg-config) --libs-only-l wayland-client wayland-egl xkbcom
mon)', |
| 598 ], | 602 ], |
| 599 }, | 603 }, |
| 600 }], | 604 }], |
| 601 ], | 605 ], |
| 602 }, | 606 }, |
| 603 ], | 607 ], |
| 604 } | 608 } |
| OLD | NEW |