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

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 a nit I had missed. 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 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 1187 matching lines...) Expand 10 before | Expand all | Expand 10 after
1198 } 1198 }
1199 1199
1200 if (is_android) { 1200 if (is_android) {
1201 generate_jni("net_jni_headers") { 1201 generate_jni("net_jni_headers") {
1202 sources = [ 1202 sources = [
1203 "android/java/src/org/chromium/net/AndroidCertVerifyResult.java", 1203 "android/java/src/org/chromium/net/AndroidCertVerifyResult.java",
1204 "android/java/src/org/chromium/net/AndroidKeyStore.java", 1204 "android/java/src/org/chromium/net/AndroidKeyStore.java",
1205 "android/java/src/org/chromium/net/AndroidNetworkLibrary.java", 1205 "android/java/src/org/chromium/net/AndroidNetworkLibrary.java",
1206 "android/java/src/org/chromium/net/AndroidPrivateKey.java", 1206 "android/java/src/org/chromium/net/AndroidPrivateKey.java",
1207 "android/java/src/org/chromium/net/GURLUtils.java", 1207 "android/java/src/org/chromium/net/GURLUtils.java",
1208 "android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java",
1208 "android/java/src/org/chromium/net/NetworkChangeNotifier.java", 1209 "android/java/src/org/chromium/net/NetworkChangeNotifier.java",
1209 "android/java/src/org/chromium/net/ProxyChangeListener.java", 1210 "android/java/src/org/chromium/net/ProxyChangeListener.java",
1210 "android/java/src/org/chromium/net/X509Util.java", 1211 "android/java/src/org/chromium/net/X509Util.java",
1211 ] 1212 ]
1212 jni_package = "net" 1213 jni_package = "net"
1213 } 1214 }
1214 generate_jni("net_test_jni_headers") { 1215 generate_jni("net_test_jni_headers") {
1215 sources = [ 1216 sources = [
1216 "android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java", 1217 "android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java",
1217 ] 1218 ]
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
1390 sources -= [ 1391 sources -= [
1391 "cert/x509_util_openssl_unittest.cc", 1392 "cert/x509_util_openssl_unittest.cc",
1392 "quic/test_tools/crypto_test_utils_openssl.cc", 1393 "quic/test_tools/crypto_test_utils_openssl.cc",
1393 "socket/ssl_client_socket_openssl_unittest.cc", 1394 "socket/ssl_client_socket_openssl_unittest.cc",
1394 "ssl/ssl_client_session_cache_openssl_unittest.cc", 1395 "ssl/ssl_client_session_cache_openssl_unittest.cc",
1395 ] 1396 ]
1396 } 1397 }
1397 1398
1398 if (use_kerberos) { 1399 if (use_kerberos) {
1399 defines += [ "USE_KERBEROS" ] 1400 defines += [ "USE_KERBEROS" ]
1400 } else { 1401 }
1402
1403 # TODO(aberent) fix and enable these tests on Android.
1404 if (!use_kerberos || is_android) {
cbentzel 2015/06/11 20:51:43 http_auth_handler_negotiate_unittest should be wor
aberent 2015/06/15 15:52:19 Unfortunately, as discussed in the email thread, I
1401 sources -= [ 1405 sources -= [
1402 "http/http_auth_gssapi_posix_unittest.cc", 1406 "http/http_auth_gssapi_posix_unittest.cc",
1403 "http/http_auth_handler_negotiate_unittest.cc", 1407 "http/http_auth_handler_negotiate_unittest.cc",
1404 "http/mock_gssapi_library_posix.cc", 1408 "http/mock_gssapi_library_posix.cc",
1405 "http/mock_gssapi_library_posix.h", 1409 "http/mock_gssapi_library_posix.h",
1406 ] 1410 ]
1407 } 1411 }
1408 1412
1409 if (use_openssl || (!is_desktop_linux && !is_chromeos && !is_ios)) { 1413 if (use_openssl || (!is_desktop_linux && !is_chromeos && !is_ios)) {
1410 # Only include this test when on Posix and using NSS for 1414 # Only include this test when on Posix and using NSS for
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
1623 } else { 1627 } else {
1624 sources -= [ "proxy/proxy_resolver_perftest.cc" ] 1628 sources -= [ "proxy/proxy_resolver_perftest.cc" ]
1625 } 1629 }
1626 1630
1627 if (is_win && icu_use_data_file) { 1631 if (is_win && icu_use_data_file) {
1628 # This is needed to trigger the dll copy step on windows. 1632 # This is needed to trigger the dll copy step on windows.
1629 # TODO(mark): Specifying this here shouldn't be necessary. 1633 # TODO(mark): Specifying this here shouldn't be necessary.
1630 deps += [ "//third_party/icu:icudata" ] 1634 deps += [ "//third_party/icu:icudata" ]
1631 } 1635 }
1632 } 1636 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698