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

Side by Side Diff: net/net.gyp

Issue 7633006: Linux: control usage of Kerberos via use_kerberos gyp flag (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 (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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8
9 'use_kerberos%': 1,
wtc 2011/08/12 17:21:51 Should we remove the blank line? What does the '%
Paweł Hajdan Jr. 2011/08/12 18:14:42 Not sure, use_kerberos is quite different from chr
8 }, 10 },
9 'targets': [ 11 'targets': [
10 { 12 {
11 'target_name': 'net', 13 'target_name': 'net',
12 'type': '<(component)', 14 'type': '<(component)',
13 'dependencies': [ 15 'dependencies': [
14 '../base/base.gyp:base', 16 '../base/base.gyp:base',
15 '../base/base.gyp:base_i18n', 17 '../base/base.gyp:base_i18n',
16 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 18 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
17 '../build/temp_gyp/googleurl.gyp:googleurl', 19 '../build/temp_gyp/googleurl.gyp:googleurl',
(...skipping 675 matching lines...) Expand 10 before | Expand all | Expand 10 after
693 'dependencies': [ 695 'dependencies': [
694 '../v8/tools/gyp/v8.gyp:v8', 696 '../v8/tools/gyp/v8.gyp:v8',
695 ], 697 ],
696 }], 698 }],
697 ['chromeos==1', { 699 ['chromeos==1', {
698 'sources!': [ 700 'sources!': [
699 'proxy/proxy_config_service_linux.cc', 701 'proxy/proxy_config_service_linux.cc',
700 'proxy/proxy_config_service_linux.h', 702 'proxy/proxy_config_service_linux.h',
701 ], 703 ],
702 }], 704 }],
705 ['use_kerberos==1', {
706 'defines': [
707 'USE_KERBEROS',
708 ],
709 'direct_dependent_settings': {
710 'defines': [
711 'USE_KERBEROS',
712 ],
713 },
wtc 2011/08/12 17:21:51 It seems that a direct dependent should not need t
cbentzel 2011/08/12 17:59:06 Is this for net_unittests?
Paweł Hajdan Jr. 2011/08/12 18:14:42 Yes, it's for net_unittests. Of course I could dup
cbentzel 2011/08/12 18:20:13 Beyond net_unittests I do not agree. I suppose som
Paweł Hajdan Jr. 2011/08/12 18:24:15 Do you want me to duplicate define: ['USE_KERBEROS
cbentzel 2011/08/14 13:04:57 I'd prefer to duplicate it in net_unittests. If ot
Paweł Hajdan Jr. 2011/08/15 17:07:53 Done.
714 }, { # use_kerberos == 0
715 'sources!': [
716 'http/http_auth_gssapi_posix.cc',
717 'http/http_auth_gssapi_posix.h',
718 'http/http_auth_handler_negotiate.h',
719 'http/http_auth_handler_negotiate.cc',
720 ],
721 }],
703 ['use_openssl==1', { 722 ['use_openssl==1', {
704 'sources!': [ 723 'sources!': [
705 'base/cert_database_nss.cc', 724 'base/cert_database_nss.cc',
706 'base/crypto_module_nss.cc', 725 'base/crypto_module_nss.cc',
707 'base/dnssec_keyset.cc', 726 'base/dnssec_keyset.cc',
708 'base/dnssec_keyset.h', 727 'base/dnssec_keyset.h',
709 'base/keygen_handler_nss.cc', 728 'base/keygen_handler_nss.cc',
710 'base/nss_memio.c', 729 'base/nss_memio.c',
711 'base/nss_memio.h', 730 'base/nss_memio.h',
712 'base/test_root_certs_nss.cc', 731 'base/test_root_certs_nss.cc',
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
1062 ], 1081 ],
1063 [ 'os_posix == 1 and OS != "mac"', { 1082 [ 'os_posix == 1 and OS != "mac"', {
1064 'conditions': [ 1083 'conditions': [
1065 ['linux_use_tcmalloc==1', { 1084 ['linux_use_tcmalloc==1', {
1066 'dependencies': [ 1085 'dependencies': [
1067 '../base/allocator/allocator.gyp:allocator', 1086 '../base/allocator/allocator.gyp:allocator',
1068 ], 1087 ],
1069 }], 1088 }],
1070 ], 1089 ],
1071 }], 1090 }],
1091 [ 'use_kerberos==0', {
1092 'sources!': [
1093 'http/http_auth_gssapi_posix_unittest.cc',
1094 'http/http_auth_handler_negotiate_unittest.cc',
1095 'http/mock_gssapi_library_posix.cc',
1096 'http/mock_gssapi_library_posix.h',
cbentzel 2011/08/12 17:59:06 There are a number of Negotiate-oriented tests in
1097 ],
1098 }],
1072 [ 'use_openssl==1', { 1099 [ 'use_openssl==1', {
1073 # When building for OpenSSL, we need to exclude NSS specific tests. 1100 # When building for OpenSSL, we need to exclude NSS specific tests.
1074 # TODO(bulach): Add equivalent tests when the underlying 1101 # TODO(bulach): Add equivalent tests when the underlying
1075 # functionality is ported to OpenSSL. 1102 # functionality is ported to OpenSSL.
1076 'sources!': [ 1103 'sources!': [
1077 'base/cert_database_nss_unittest.cc', 1104 'base/cert_database_nss_unittest.cc',
1078 'base/dnssec_unittest.cc', 1105 'base/dnssec_unittest.cc',
1079 ], 1106 ],
1080 }, 1107 },
1081 ], 1108 ],
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
1486 'tools/dump_cache/url_to_filename_encoder.cc', 1513 'tools/dump_cache/url_to_filename_encoder.cc',
1487 'tools/dump_cache/url_to_filename_encoder.h', 1514 'tools/dump_cache/url_to_filename_encoder.h',
1488 'tools/dump_cache/url_utilities.h', 1515 'tools/dump_cache/url_utilities.h',
1489 'tools/dump_cache/url_utilities.cc', 1516 'tools/dump_cache/url_utilities.cc',
1490 ], 1517 ],
1491 }, 1518 },
1492 ], 1519 ],
1493 }], 1520 }],
1494 ], 1521 ],
1495 } 1522 }
OLDNEW
« net/http/http_auth_unittest.cc ('K') | « net/http/http_auth_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698