| OLD | NEW |
| 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 # If any of the linux_link_FOO below are set to 1, then the corresponding | 7 # If any of the linux_link_FOO below are set to 1, then the corresponding |
| 8 # target will be linked against the FOO library (either dynamically or | 8 # target will be linked against the FOO library (either dynamically or |
| 9 # statically, depending on the pkg-config files), as opposed to loading the | 9 # statically, depending on the pkg-config files), as opposed to loading the |
| 10 # FOO library dynamically with dlopen. | 10 # FOO library dynamically with dlopen. |
| (...skipping 969 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 980 'type': 'none', | 980 'type': 'none', |
| 981 'conditions': [ | 981 'conditions': [ |
| 982 ['use_gnome_keyring==1', { | 982 ['use_gnome_keyring==1', { |
| 983 'direct_dependent_settings': { | 983 'direct_dependent_settings': { |
| 984 'cflags': [ | 984 'cflags': [ |
| 985 '<!@(<(pkg-config) --cflags gnome-keyring-1)', | 985 '<!@(<(pkg-config) --cflags gnome-keyring-1)', |
| 986 ], | 986 ], |
| 987 'defines': [ | 987 'defines': [ |
| 988 'USE_GNOME_KEYRING', | 988 'USE_GNOME_KEYRING', |
| 989 ], | 989 ], |
| 990 'conditions': [ | |
| 991 ['linux_link_gnome_keyring==0', { | |
| 992 'defines': ['DLOPEN_GNOME_KEYRING'], | |
| 993 }], | |
| 994 ], | |
| 995 }, | 990 }, |
| 996 'conditions': [ | |
| 997 ['linux_link_gnome_keyring!=0', { | |
| 998 'link_settings': { | |
| 999 'ldflags': [ | |
| 1000 '<!@(<(pkg-config) --libs-only-L --libs-only-other gnome-keyri
ng-1)', | |
| 1001 ], | |
| 1002 'libraries': [ | |
| 1003 '<!@(<(pkg-config) --libs-only-l gnome-keyring-1)', | |
| 1004 ], | |
| 1005 }, | |
| 1006 }, { | |
| 1007 'conditions': [ | |
| 1008 ['OS=="linux"', { | |
| 1009 'link_settings': { | |
| 1010 'libraries': [ | |
| 1011 '-ldl', | |
| 1012 ], | |
| 1013 }, | |
| 1014 }], | |
| 1015 ], | |
| 1016 }], | |
| 1017 ], | |
| 1018 }], | 991 }], |
| 1019 ], | 992 ], |
| 1020 }, | 993 }, |
| 1021 { | 994 { |
| 1022 # The unit tests use a few convenience functions from the GNOME | 995 # The unit tests use a few convenience functions from the GNOME |
| 1023 # Keyring library directly. We ignore linux_link_gnome_keyring and | 996 # Keyring library directly. We link directly in this version of |
| 1024 # link directly in this version of the target to allow this. | 997 # the target to allow this. |
| 1025 # *** Do not use this target in the main binary! *** | 998 # *** Do not use this target in the main binary! *** |
| 1026 'target_name': 'gnome_keyring_direct', | 999 'target_name': 'gnome_keyring_direct', |
| 1027 'type': 'none', | 1000 'type': 'none', |
| 1028 'conditions': [ | 1001 'conditions': [ |
| 1029 ['use_gnome_keyring==1', { | 1002 ['use_gnome_keyring==1', { |
| 1030 'direct_dependent_settings': { | 1003 'direct_dependent_settings': { |
| 1031 'cflags': [ | 1004 'cflags': [ |
| 1032 '<!@(<(pkg-config) --cflags gnome-keyring-1)', | 1005 '<!@(<(pkg-config) --cflags gnome-keyring-1)', |
| 1033 ], | 1006 ], |
| 1034 'defines': [ | 1007 'defines': [ |
| 1035 'USE_GNOME_KEYRING', | 1008 'USE_GNOME_KEYRING', |
| 1036 ], | 1009 ], |
| 1037 'conditions': [ | |
| 1038 ['linux_link_gnome_keyring==0', { | |
| 1039 'defines': ['DLOPEN_GNOME_KEYRING'], | |
| 1040 }], | |
| 1041 ], | |
| 1042 }, | 1010 }, |
| 1043 'link_settings': { | 1011 'link_settings': { |
| 1044 'ldflags': [ | 1012 'ldflags': [ |
| 1045 '<!@(<(pkg-config) --libs-only-L --libs-only-other gnome-keyring-1
)', | 1013 '<!@(<(pkg-config) --libs-only-L --libs-only-other gnome-keyring-1
)', |
| 1046 ], | 1014 ], |
| 1047 'libraries': [ | 1015 'libraries': [ |
| 1048 '<!@(<(pkg-config) --libs-only-l gnome-keyring-1)', | 1016 '<!@(<(pkg-config) --libs-only-l gnome-keyring-1)', |
| 1049 ], | 1017 ], |
| 1050 }, | 1018 }, |
| 1051 }], | 1019 }], |
| (...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1293 ], | 1261 ], |
| 1294 'libraries': [ | 1262 'libraries': [ |
| 1295 '<!@(<(pkg-config) --libs-only-l libffi)', | 1263 '<!@(<(pkg-config) --libs-only-l libffi)', |
| 1296 ], | 1264 ], |
| 1297 }, | 1265 }, |
| 1298 }], | 1266 }], |
| 1299 ], | 1267 ], |
| 1300 }, | 1268 }, |
| 1301 ], | 1269 ], |
| 1302 } | 1270 } |
| OLD | NEW |