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

Side by Side Diff: net/net.gyp

Issue 4646001: Implement LoadTemporaryRoot for Windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/net/base
Patch Set: Rebase to trunk with OpenSSL fixes from joth Created 10 years, 1 month 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
OLDNEW
1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 'base/ssl_config_service_defaults.h', 168 'base/ssl_config_service_defaults.h',
169 'base/ssl_config_service_mac.cc', 169 'base/ssl_config_service_mac.cc',
170 'base/ssl_config_service_mac.h', 170 'base/ssl_config_service_mac.h',
171 'base/ssl_config_service_win.cc', 171 'base/ssl_config_service_win.cc',
172 'base/ssl_config_service_win.h', 172 'base/ssl_config_service_win.h',
173 'base/ssl_false_start_blacklist.cc', 173 'base/ssl_false_start_blacklist.cc',
174 'base/ssl_info.cc', 174 'base/ssl_info.cc',
175 'base/ssl_info.h', 175 'base/ssl_info.h',
176 'base/static_cookie_policy.cc', 176 'base/static_cookie_policy.cc',
177 'base/static_cookie_policy.h', 177 'base/static_cookie_policy.h',
178 'base/test_root_certs.cc',
179 'base/test_root_certs.h',
180 'base/test_root_certs_mac.cc',
181 'base/test_root_certs_nss.cc',
182 'base/test_root_certs_openssl.cc',
183 'base/test_root_certs_win.cc',
178 'base/transport_security_state.cc', 184 'base/transport_security_state.cc',
179 'base/transport_security_state.h', 185 'base/transport_security_state.h',
180 'base/sys_addrinfo.h', 186 'base/sys_addrinfo.h',
181 'base/test_completion_callback.h', 187 'base/test_completion_callback.h',
182 'base/upload_data.cc', 188 'base/upload_data.cc',
183 'base/upload_data.h', 189 'base/upload_data.h',
184 'base/upload_data_stream.cc', 190 'base/upload_data_stream.cc',
185 'base/upload_data_stream.h', 191 'base/upload_data_stream.h',
186 'base/winsock_init.cc', 192 'base/winsock_init.cc',
187 'base/winsock_init.h', 193 'base/winsock_init.h',
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 'dependencies': [ 249 'dependencies': [
244 '../build/linux/system.gyp:nss', 250 '../build/linux/system.gyp:nss',
245 ], 251 ],
246 }], 252 }],
247 ], 253 ],
248 }, 254 },
249 { # else: OS is not in the above list 255 { # else: OS is not in the above list
250 'sources!': [ 256 'sources!': [
251 'base/cert_database_nss.cc', 257 'base/cert_database_nss.cc',
252 'base/keygen_handler_nss.cc', 258 'base/keygen_handler_nss.cc',
259 'base/test_root_certs_nss.cc',
253 'base/x509_certificate_nss.cc', 260 'base/x509_certificate_nss.cc',
254 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', 261 'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
255 'third_party/mozilla_security_manager/nsKeygenHandler.h', 262 'third_party/mozilla_security_manager/nsKeygenHandler.h',
256 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp', 263 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
257 'third_party/mozilla_security_manager/nsNSSCertificateDB.h', 264 'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
258 'third_party/mozilla_security_manager/nsNSSCertTrust.cpp', 265 'third_party/mozilla_security_manager/nsNSSCertTrust.cpp',
259 'third_party/mozilla_security_manager/nsNSSCertTrust.h', 266 'third_party/mozilla_security_manager/nsNSSCertTrust.h',
260 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp', 267 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
261 'third_party/mozilla_security_manager/nsPKCS12Blob.h', 268 'third_party/mozilla_security_manager/nsPKCS12Blob.h',
262 ], 269 ],
263 }, 270 },
264 ], 271 ],
265 [ 'use_openssl==1', { 272 [ 'use_openssl==1', {
266 'sources!': [ 273 'sources!': [
267 'base/cert_database_nss.cc', 274 'base/cert_database_nss.cc',
268 'base/dnssec_keyset.cc', 275 'base/dnssec_keyset.cc',
269 'base/dnssec_keyset.h', 276 'base/dnssec_keyset.h',
270 'base/keygen_handler_nss.cc', 277 'base/keygen_handler_nss.cc',
271 'base/nss_memio.c', 278 'base/nss_memio.c',
272 'base/nss_memio.h', 279 'base/nss_memio.h',
280 'base/test_root_certs_nss.cc',
273 'base/x509_certificate_nss.cc', 281 'base/x509_certificate_nss.cc',
274 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', 282 'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
275 'third_party/mozilla_security_manager/nsKeygenHandler.h', 283 'third_party/mozilla_security_manager/nsKeygenHandler.h',
276 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp', 284 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
277 'third_party/mozilla_security_manager/nsNSSCertificateDB.h', 285 'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
278 'third_party/mozilla_security_manager/nsNSSCertTrust.cpp', 286 'third_party/mozilla_security_manager/nsNSSCertTrust.cpp',
279 'third_party/mozilla_security_manager/nsNSSCertTrust.h', 287 'third_party/mozilla_security_manager/nsNSSCertTrust.h',
280 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp', 288 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
281 'third_party/mozilla_security_manager/nsPKCS12Blob.h', 289 'third_party/mozilla_security_manager/nsPKCS12Blob.h',
282 ], 290 ],
283 }, 291 },
284 { # else: not using openssl. 292 { # else: not using openssl.
285 'sources!': [ 293 'sources!': [
286 'base/cert_database_openssl.cc', 294 'base/cert_database_openssl.cc',
287 'base/keygen_handler_openssl.cc', 295 'base/keygen_handler_openssl.cc',
296 'base/test_root_certs_openssl.cc',
288 'base/x509_certificate_openssl.cc', 297 'base/x509_certificate_openssl.cc',
289 'base/x509_openssl_util.cc', 298 'base/x509_openssl_util.cc',
290 'base/x509_openssl_util.h', 299 'base/x509_openssl_util.h',
291 ], 300 ],
292 }, 301 },
293 ], 302 ],
294 [ 'OS == "win"', { 303 [ 'OS == "win"', {
295 'dependencies': [ 304 'dependencies': [
296 '../third_party/nss/nss.gyp:nss', 305 '../third_party/nss/nss.gyp:nss',
297 'tld_cleanup', 306 'tld_cleanup',
(...skipping 855 matching lines...) Expand 10 before | Expand all | Expand 10 after
1153 { 1162 {
1154 'target_name': 'net_test_support', 1163 'target_name': 'net_test_support',
1155 'type': '<(library)', 1164 'type': '<(library)',
1156 'dependencies': [ 1165 'dependencies': [
1157 'net', 1166 'net',
1158 '../base/base.gyp:base', 1167 '../base/base.gyp:base',
1159 '../base/base.gyp:test_support_base', 1168 '../base/base.gyp:test_support_base',
1160 '../testing/gtest.gyp:gtest', 1169 '../testing/gtest.gyp:gtest',
1161 ], 1170 ],
1162 'sources': [ 1171 'sources': [
1163 'base/cert_test_util.cc',
1164 'base/cert_test_util.h',
1165 'disk_cache/disk_cache_test_util.cc', 1172 'disk_cache/disk_cache_test_util.cc',
1166 'disk_cache/disk_cache_test_util.h', 1173 'disk_cache/disk_cache_test_util.h',
1167 'proxy/proxy_config_service_common_unittest.cc', 1174 'proxy/proxy_config_service_common_unittest.cc',
1168 'proxy/proxy_config_service_common_unittest.h', 1175 'proxy/proxy_config_service_common_unittest.h',
1169 'socket/socket_test_util.cc', 1176 'socket/socket_test_util.cc',
1170 'socket/socket_test_util.h', 1177 'socket/socket_test_util.h',
1171 'test/python_utils.cc', 1178 'test/python_utils.cc',
1172 'test/python_utils.h', 1179 'test/python_utils.h',
1173 'test/test_server.cc', 1180 'test/test_server.cc',
1174 'test/test_server_posix.cc', 1181 'test/test_server_posix.cc',
1175 'test/test_server_win.cc', 1182 'test/test_server_win.cc',
1176 'test/test_server.h', 1183 'test/test_server.h',
1177 ], 1184 ],
1178 'conditions': [ 1185 'conditions': [
1179 ['inside_chromium_build==1', { 1186 ['inside_chromium_build==1', {
1180 'dependencies': [ 1187 'dependencies': [
1181 '../chrome/browser/sync/protocol/sync_proto.gyp:sync_proto', 1188 '../chrome/browser/sync/protocol/sync_proto.gyp:sync_proto',
1182 '../chrome/browser/policy/proto/device_management_proto.gyp:device_m anagement_proto', 1189 '../chrome/browser/policy/proto/device_management_proto.gyp:device_m anagement_proto',
1183 '../third_party/protobuf/protobuf.gyp:py_proto', 1190 '../third_party/protobuf/protobuf.gyp:py_proto',
1184 ], 1191 ],
1185 }], 1192 }],
1186 ['OS == "linux" or OS == "freebsd" or OS == "openbsd"', { 1193 ['OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
1187 'conditions': [ 1194 'conditions': [
1188 ['use_openssl==1', { 1195 ['use_openssl==1', {
1189 'dependencies': [ 1196 'dependencies': [
1190 '../build/linux/system.gyp:openssl', 1197 '../build/linux/system.gyp:openssl',
1191 ] 1198 ],
1192 }, { 1199 }, {
1193 'dependencies': [ 1200 'dependencies': [
1194 '../build/linux/system.gyp:nss', 1201 '../build/linux/system.gyp:nss',
1195 ], 1202 ],
1196 }], 1203 }],
1197 ], 1204 ],
1198 }], 1205 }],
1199 ['OS == "linux"', { 1206 ['OS == "linux"', {
1200 'conditions': [ 1207 'conditions': [
1201 ['linux_use_tcmalloc==1', { 1208 ['linux_use_tcmalloc==1', {
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
1444 ], 1451 ],
1445 }], 1452 }],
1446 ], 1453 ],
1447 } 1454 }
1448 1455
1449 # Local Variables: 1456 # Local Variables:
1450 # tab-width:2 1457 # tab-width:2
1451 # indent-tabs-mode:nil 1458 # indent-tabs-mode:nil
1452 # End: 1459 # End:
1453 # vim: set expandtab tabstop=2 shiftwidth=2: 1460 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698