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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/net.gyp

Issue 1128043007: Support Kerberos on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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_basic_unittest.cc ('K') | « net/http/http_auth_handler_negotiate.cc ('k') | net/net.gypi » ('j') | net/net.gypi » ('J')
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 3db83b5fa0dbcf3c6a0b65a37182690cb9117bfb..4c4bbf03d13edd70d7d1d551e10092a80dff6195 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -8,11 +8,11 @@
'linux_link_kerberos%': 0,
'conditions': [
- ['chromeos==1 or embedded==1 or OS=="android" or OS=="ios"', {
- # Disable Kerberos on ChromeOS, Android and iOS, at least for now.
+ ['chromeos==1 or embedded==1 or OS=="ios"', {
+ # Disable Kerberos on ChromeOS and iOS, at least for now.
# It needs configuration (krb5.conf and so on).
'use_kerberos%': 0,
- }, { # chromeos == 0 and embedded==0 and OS!="android" and OS!="ios"
+ }, { # chromeos == 0 and embedded==0 and OS!="ios"
'use_kerberos%': 1,
}],
['OS=="android" and target_arch != "ia32"', {
@@ -1340,6 +1340,7 @@
'android/java/src/org/chromium/net/AndroidNetworkLibrary.java',
'android/java/src/org/chromium/net/AndroidPrivateKey.java',
'android/java/src/org/chromium/net/GURLUtils.java',
+ 'android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java',
'android/java/src/org/chromium/net/NetStringUtil.java',
'android/java/src/org/chromium/net/NetworkChangeNotifier.java',
'android/java/src/org/chromium/net/ProxyChangeListener.java',
« net/http/http_auth_handler_basic_unittest.cc ('K') | « net/http/http_auth_handler_negotiate.cc ('k') | net/net.gypi » ('j') | net/net.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698