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

Unified Diff: net/BUILD.gn

Issue 1128043007: Support Kerberos on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Android GN build Created 5 years, 6 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
Index: net/BUILD.gn
diff --git a/net/BUILD.gn b/net/BUILD.gn
index e8a8da64935c7ece78c1477e28e44dfdd5c7140c..31cdb3c517a708dd41ff89d7a5b7a95736efef03 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -1205,6 +1205,7 @@ if (is_android) {
"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/NetworkChangeNotifier.java",
"android/java/src/org/chromium/net/ProxyChangeListener.java",
"android/java/src/org/chromium/net/X509Util.java",
@@ -1214,6 +1215,7 @@ if (is_android) {
generate_jni("net_test_jni_headers") {
sources = [
"android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java",
+ "test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator.java",
]
jni_package = "net"
}
@@ -1397,14 +1399,19 @@ if (!is_android && !is_mac) {
if (use_kerberos) {
defines += [ "USE_KERBEROS" ]
- } else {
+ }
+
+ # TODO(aberent) fix and enable these tests on Android.
cbentzel 2015/06/30 12:53:55 Copy over the comment from net.gyp explaining why
aberent 2015/07/02 21:13:34 Done.
+ if (!use_kerberos || is_android) {
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",
]
}
+ if (!use_kerberos) {
+ sources -= [ "http/http_auth_handler_negotiate_unittest.cc" ]
+ }
if (use_openssl || (!is_desktop_linux && !is_chromeos && !is_ios)) {
# Only include this test when on Posix and using NSS for
« no previous file with comments | « google_apis/gcm/tools/mcs_probe.cc ('k') | net/android/BUILD.gn » ('j') | net/android/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698