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

Side by Side Diff: net/BUILD.gn

Issue 1128043007: Support Kerberos on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compile errors caused by trying to forward declare a typedef Created 5 years, 5 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
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 import("//build/config/crypto.gni") 5 import("//build/config/crypto.gni")
6 import("//build/config/features.gni") 6 import("//build/config/features.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//build/module_args/v8.gni") 8 import("//build/module_args/v8.gni")
9 import("//url/config.gni") 9 import("//url/config.gni")
10 import("//testing/test.gni") 10 import("//testing/test.gni")
(...skipping 1198 matching lines...) Expand 10 before | Expand all | Expand 10 after
1209 } 1209 }
1210 1210
1211 if (is_android) { 1211 if (is_android) {
1212 generate_jni("net_jni_headers") { 1212 generate_jni("net_jni_headers") {
1213 sources = [ 1213 sources = [
1214 "android/java/src/org/chromium/net/AndroidCertVerifyResult.java", 1214 "android/java/src/org/chromium/net/AndroidCertVerifyResult.java",
1215 "android/java/src/org/chromium/net/AndroidKeyStore.java", 1215 "android/java/src/org/chromium/net/AndroidKeyStore.java",
1216 "android/java/src/org/chromium/net/AndroidNetworkLibrary.java", 1216 "android/java/src/org/chromium/net/AndroidNetworkLibrary.java",
1217 "android/java/src/org/chromium/net/AndroidPrivateKey.java", 1217 "android/java/src/org/chromium/net/AndroidPrivateKey.java",
1218 "android/java/src/org/chromium/net/GURLUtils.java", 1218 "android/java/src/org/chromium/net/GURLUtils.java",
1219 "android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java",
1219 "android/java/src/org/chromium/net/NetworkChangeNotifier.java", 1220 "android/java/src/org/chromium/net/NetworkChangeNotifier.java",
1220 "android/java/src/org/chromium/net/ProxyChangeListener.java", 1221 "android/java/src/org/chromium/net/ProxyChangeListener.java",
1221 "android/java/src/org/chromium/net/X509Util.java", 1222 "android/java/src/org/chromium/net/X509Util.java",
1222 ] 1223 ]
1223 jni_package = "net" 1224 jni_package = "net"
1224 } 1225 }
1225 generate_jni("net_test_jni_headers") { 1226 generate_jni("net_test_jni_headers") {
1226 sources = [ 1227 sources = [
1227 "android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java", 1228 "android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java",
1229 "test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator .java",
1228 ] 1230 ]
1229 jni_package = "net" 1231 jni_package = "net"
1230 } 1232 }
1231 } 1233 }
1232 1234
1233 if (is_android || is_linux) { 1235 if (is_android || is_linux) {
1234 executable("disk_cache_memory_test") { 1236 executable("disk_cache_memory_test") {
1235 testonly = true 1237 testonly = true
1236 sources = [ 1238 sources = [
1237 "tools/disk_cache_memory_test/disk_cache_memory_test.cc", 1239 "tools/disk_cache_memory_test/disk_cache_memory_test.cc",
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
1401 sources -= [ 1403 sources -= [
1402 "cert/x509_util_openssl_unittest.cc", 1404 "cert/x509_util_openssl_unittest.cc",
1403 "quic/test_tools/crypto_test_utils_openssl.cc", 1405 "quic/test_tools/crypto_test_utils_openssl.cc",
1404 "socket/ssl_client_socket_openssl_unittest.cc", 1406 "socket/ssl_client_socket_openssl_unittest.cc",
1405 "ssl/ssl_client_session_cache_openssl_unittest.cc", 1407 "ssl/ssl_client_session_cache_openssl_unittest.cc",
1406 ] 1408 ]
1407 } 1409 }
1408 1410
1409 if (use_kerberos) { 1411 if (use_kerberos) {
1410 defines += [ "USE_KERBEROS" ] 1412 defines += [ "USE_KERBEROS" ]
1411 } else { 1413 }
1414
1415 # These are excluded on Android, because the actual Kerberos support, which
1416 # these test, is in a separate app on Android.
1417 if (!use_kerberos || is_android) {
1412 sources -= [ 1418 sources -= [
1413 "http/http_auth_gssapi_posix_unittest.cc", 1419 "http/http_auth_gssapi_posix_unittest.cc",
1414 "http/http_auth_handler_negotiate_unittest.cc",
1415 "http/mock_gssapi_library_posix.cc", 1420 "http/mock_gssapi_library_posix.cc",
1416 "http/mock_gssapi_library_posix.h", 1421 "http/mock_gssapi_library_posix.h",
1417 ] 1422 ]
1418 } 1423 }
1424 if (!use_kerberos) {
1425 sources -= [ "http/http_auth_handler_negotiate_unittest.cc" ]
1426 }
1419 1427
1420 if (use_openssl || (!is_desktop_linux && !is_chromeos && !is_ios)) { 1428 if (use_openssl || (!is_desktop_linux && !is_chromeos && !is_ios)) {
1421 # Only include this test when on Posix and using NSS for 1429 # Only include this test when on Posix and using NSS for
1422 # cert verification or on iOS (which also uses NSS for certs). 1430 # cert verification or on iOS (which also uses NSS for certs).
1423 sources -= [ "cert_net/nss_ocsp_unittest.cc" ] 1431 sources -= [ "cert_net/nss_ocsp_unittest.cc" ]
1424 } 1432 }
1425 1433
1426 if (!use_openssl_certs) { 1434 if (!use_openssl_certs) {
1427 sources -= [ "ssl/openssl_client_key_store_unittest.cc" ] 1435 sources -= [ "ssl/openssl_client_key_store_unittest.cc" ]
1428 } 1436 }
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
1634 } else { 1642 } else {
1635 sources -= [ "proxy/proxy_resolver_perftest.cc" ] 1643 sources -= [ "proxy/proxy_resolver_perftest.cc" ]
1636 } 1644 }
1637 1645
1638 if (is_win && icu_use_data_file) { 1646 if (is_win && icu_use_data_file) {
1639 # This is needed to trigger the dll copy step on windows. 1647 # This is needed to trigger the dll copy step on windows.
1640 # TODO(mark): Specifying this here shouldn't be necessary. 1648 # TODO(mark): Specifying this here shouldn't be necessary.
1641 deps += [ "//third_party/icu:icudata" ] 1649 deps += [ "//third_party/icu:icudata" ]
1642 } 1650 }
1643 } 1651 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698