| OLD | NEW |
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 # This target is included in both 'net' and 'net_small'. | 6 # This target is included in both 'net' and 'net_small'. |
| 7 'type': '<(component)', | 7 'type': '<(component)', |
| 8 'variables': { 'enable_wexit_time_destructors': 1, }, | 8 'variables': { 'enable_wexit_time_destructors': 1, }, |
| 9 'dependencies': [ | 9 'dependencies': [ |
| 10 '../base/base.gyp:base', | 10 '../base/base.gyp:base', |
| (...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 347 [ 'OS == "ios"', { | 347 [ 'OS == "ios"', { |
| 348 'sources!': [ | 348 'sources!': [ |
| 349 'disk_cache/blockfile/file_posix.cc', | 349 'disk_cache/blockfile/file_posix.cc', |
| 350 ], | 350 ], |
| 351 'link_settings': { | 351 'link_settings': { |
| 352 'libraries': [ | 352 'libraries': [ |
| 353 '$(SDKROOT)/System/Library/Frameworks/CFNetwork.framework', | 353 '$(SDKROOT)/System/Library/Frameworks/CFNetwork.framework', |
| 354 '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework', | 354 '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework', |
| 355 '$(SDKROOT)/System/Library/Frameworks/Security.framework', | 355 '$(SDKROOT)/System/Library/Frameworks/Security.framework', |
| 356 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framework'
, | 356 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framework'
, |
| 357 '$(SDKROOT)/usr/lib/libresolv.dylib', | |
| 358 ], | 357 ], |
| 358 'xcode_settings': { |
| 359 'OTHER_LDFLAGS': [ |
| 360 '-lresolv', |
| 361 ], |
| 362 }, |
| 359 }, | 363 }, |
| 360 }, | 364 }, |
| 361 ], | 365 ], |
| 362 [ 'OS == "ios" or OS == "mac"', { | 366 [ 'OS == "ios" or OS == "mac"', { |
| 363 'sources': [ | 367 'sources': [ |
| 364 '<@(net_base_mac_ios_sources)', | 368 '<@(net_base_mac_ios_sources)', |
| 365 ], | 369 ], |
| 366 }, | 370 }, |
| 367 ], | 371 ], |
| 368 ['OS=="android" and _toolset=="target"', { | 372 ['OS=="android" and _toolset=="target"', { |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 415 ['include', '^cert/test_root_certs_nss\\.cc$'], | 419 ['include', '^cert/test_root_certs_nss\\.cc$'], |
| 416 ['include', '^cert/x509_util_nss_certs\\.cc$'], | 420 ['include', '^cert/x509_util_nss_certs\\.cc$'], |
| 417 ['include', '^cert_net/nss_ocsp\\.cc$'], | 421 ['include', '^cert_net/nss_ocsp\\.cc$'], |
| 418 ['include', '^cert_net/nss_ocsp\\.h$'], | 422 ['include', '^cert_net/nss_ocsp\\.h$'], |
| 419 ['include', '^proxy/proxy_resolver_mac\\.cc$'], | 423 ['include', '^proxy/proxy_resolver_mac\\.cc$'], |
| 420 ['include', '^proxy/proxy_server_mac\\.cc$'], | 424 ['include', '^proxy/proxy_server_mac\\.cc$'], |
| 421 ], | 425 ], |
| 422 }], | 426 }], |
| 423 ], | 427 ], |
| 424 } | 428 } |
| OLD | NEW |