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

Unified 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 side-by-side diff with in-line comments
Download patch
« net/http/http_auth_unittest.cc ('K') | « net/http/http_auth_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 9a65bf70dbe46f4af65c4452f23a5b43c69a0965..b22a5f9e08e3595458651d6f911d481c211a4f2b 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -5,6 +5,8 @@
{
'variables': {
'chromium_code': 1,
+
+ '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
},
'targets': [
{
@@ -700,6 +702,23 @@
'proxy/proxy_config_service_linux.h',
],
}],
+ ['use_kerberos==1', {
+ 'defines': [
+ 'USE_KERBEROS',
+ ],
+ 'direct_dependent_settings': {
+ 'defines': [
+ 'USE_KERBEROS',
+ ],
+ },
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.
+ }, { # use_kerberos == 0
+ 'sources!': [
+ 'http/http_auth_gssapi_posix.cc',
+ 'http/http_auth_gssapi_posix.h',
+ 'http/http_auth_handler_negotiate.h',
+ 'http/http_auth_handler_negotiate.cc',
+ ],
+ }],
['use_openssl==1', {
'sources!': [
'base/cert_database_nss.cc',
@@ -1069,6 +1088,14 @@
}],
],
}],
+ [ 'use_kerberos==0', {
+ 'sources!': [
+ 'http/http_auth_gssapi_posix_unittest.cc',
+ 'http/http_auth_handler_negotiate_unittest.cc',
+ 'http/mock_gssapi_library_posix.cc',
+ 'http/mock_gssapi_library_posix.h',
cbentzel 2011/08/12 17:59:06 There are a number of Negotiate-oriented tests in
+ ],
+ }],
[ 'use_openssl==1', {
# When building for OpenSSL, we need to exclude NSS specific tests.
# TODO(bulach): Add equivalent tests when the underlying
« 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