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

Side by Side Diff: net/net.gyp

Issue 21368005: Detect domain-specific resolvers on OS X and disable DnsClient in such cases. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update net.gyp Created 7 years, 4 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 | Annotate | Revision Log
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'use_tracing_cache_backend%': 0, 10 'use_tracing_cache_backend%': 0,
(...skipping 1361 matching lines...) Expand 10 before | Expand all | Expand 10 after
1372 'base/winsock_util.h', 1372 'base/winsock_util.h',
1373 'proxy/proxy_resolver_winhttp.cc', 1373 'proxy/proxy_resolver_winhttp.cc',
1374 'proxy/proxy_resolver_winhttp.h', 1374 'proxy/proxy_resolver_winhttp.h',
1375 ], 1375 ],
1376 }, 1376 },
1377 ], 1377 ],
1378 [ 'OS == "mac"', { 1378 [ 'OS == "mac"', {
1379 'sources!': [ 1379 'sources!': [
1380 'ssl/client_cert_store_impl_nss.cc', 1380 'ssl/client_cert_store_impl_nss.cc',
1381 ], 1381 ],
1382 'sources' : [
1383 'third_party/apple_apsl/dnsinfo.h',
Mark Mentovai 2013/08/06 18:05:28 This path is wrong. You would want to use ../third
szym 2013/08/06 22:14:19 Removed.
1384 ],
1382 'dependencies': [ 1385 'dependencies': [
1383 '../third_party/nss/nss.gyp:nspr', 1386 '../third_party/nss/nss.gyp:nspr',
1384 '../third_party/nss/nss.gyp:nss', 1387 '../third_party/nss/nss.gyp:nss',
1385 'third_party/nss/ssl.gyp:libssl', 1388 'third_party/nss/ssl.gyp:libssl',
1386 ], 1389 ],
1387 'link_settings': { 1390 'link_settings': {
1388 'libraries': [ 1391 'libraries': [
1389 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', 1392 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
1390 '$(SDKROOT)/System/Library/Frameworks/Security.framework', 1393 '$(SDKROOT)/System/Library/Frameworks/Security.framework',
1391 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framew ork', 1394 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framew ork',
(...skipping 1494 matching lines...) Expand 10 before | Expand all | Expand 10 after
2886 'net_unittests.isolate', 2889 'net_unittests.isolate',
2887 ], 2890 ],
2888 'sources': [ 2891 'sources': [
2889 'net_unittests.isolate', 2892 'net_unittests.isolate',
2890 ], 2893 ],
2891 }, 2894 },
2892 ], 2895 ],
2893 }], 2896 }],
2894 ], 2897 ],
2895 } 2898 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698