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

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: dupe 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_handler_factory.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 4b2259eb9605039822b4dc35e409073a7e86350a..801001691e3fd4067a00f89aae079ea04ef677b5 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -5,6 +5,8 @@
{
'variables': {
'chromium_code': 1,
+
+ 'use_kerberos%': 1,
},
'targets': [
{
@@ -700,6 +702,18 @@
'proxy/proxy_config_service_linux.h',
],
}],
+ ['use_kerberos==1', {
+ 'defines': [
+ 'USE_KERBEROS',
+ ],
+ }, { # 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',
@@ -1070,6 +1084,18 @@
}],
],
}],
+ [ 'use_kerberos==1', {
+ 'defines': [
+ 'USE_KERBEROS',
+ ],
+ }, { # 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',
+ ],
+ }],
[ '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_handler_factory.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