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

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: Changes for bauerb@'s comments, plus some other minor fixes. 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 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 1179 matching lines...) Expand 10 before | Expand all | Expand 10 after
1190 } 1190 }
1191 1191
1192 if (is_android) { 1192 if (is_android) {
1193 generate_jni("net_jni_headers") { 1193 generate_jni("net_jni_headers") {
1194 sources = [ 1194 sources = [
1195 "android/java/src/org/chromium/net/AndroidCertVerifyResult.java", 1195 "android/java/src/org/chromium/net/AndroidCertVerifyResult.java",
1196 "android/java/src/org/chromium/net/AndroidKeyStore.java", 1196 "android/java/src/org/chromium/net/AndroidKeyStore.java",
1197 "android/java/src/org/chromium/net/AndroidNetworkLibrary.java", 1197 "android/java/src/org/chromium/net/AndroidNetworkLibrary.java",
1198 "android/java/src/org/chromium/net/AndroidPrivateKey.java", 1198 "android/java/src/org/chromium/net/AndroidPrivateKey.java",
1199 "android/java/src/org/chromium/net/GURLUtils.java", 1199 "android/java/src/org/chromium/net/GURLUtils.java",
1200 "android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java",
1200 "android/java/src/org/chromium/net/NetworkChangeNotifier.java", 1201 "android/java/src/org/chromium/net/NetworkChangeNotifier.java",
1201 "android/java/src/org/chromium/net/ProxyChangeListener.java", 1202 "android/java/src/org/chromium/net/ProxyChangeListener.java",
1202 "android/java/src/org/chromium/net/X509Util.java", 1203 "android/java/src/org/chromium/net/X509Util.java",
1203 ] 1204 ]
1204 jni_package = "net" 1205 jni_package = "net"
1205 } 1206 }
1206 generate_jni("net_test_jni_headers") { 1207 generate_jni("net_test_jni_headers") {
1207 sources = [ 1208 sources = [
1208 "android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java", 1209 "android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java",
1209 ] 1210 ]
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
1384 sources -= [ 1385 sources -= [
1385 "cert/x509_util_openssl_unittest.cc", 1386 "cert/x509_util_openssl_unittest.cc",
1386 "quic/test_tools/crypto_test_utils_openssl.cc", 1387 "quic/test_tools/crypto_test_utils_openssl.cc",
1387 "socket/ssl_client_socket_openssl_unittest.cc", 1388 "socket/ssl_client_socket_openssl_unittest.cc",
1388 "ssl/ssl_client_session_cache_openssl_unittest.cc", 1389 "ssl/ssl_client_session_cache_openssl_unittest.cc",
1389 ] 1390 ]
1390 } 1391 }
1391 1392
1392 if (use_kerberos) { 1393 if (use_kerberos) {
1393 defines += [ "USE_KERBEROS" ] 1394 defines += [ "USE_KERBEROS" ]
1394 } else { 1395 }
1396
1397 # TODO(aberent) fix and enable these tests on Android.
1398 if (!use_kerberos || is_android) {
1395 sources -= [ 1399 sources -= [
1396 "http/http_auth_gssapi_posix_unittest.cc", 1400 "http/http_auth_gssapi_posix_unittest.cc",
1397 "http/http_auth_handler_negotiate_unittest.cc", 1401 "http/http_auth_handler_negotiate_unittest.cc",
1398 "http/mock_gssapi_library_posix.cc", 1402 "http/mock_gssapi_library_posix.cc",
1399 "http/mock_gssapi_library_posix.h", 1403 "http/mock_gssapi_library_posix.h",
1400 ] 1404 ]
1401 } 1405 }
1402 1406
1403 if (use_openssl || (!is_desktop_linux && !is_chromeos && !is_ios)) { 1407 if (use_openssl || (!is_desktop_linux && !is_chromeos && !is_ios)) {
1404 # Only include this test when on Posix and using NSS for 1408 # Only include this test when on Posix and using NSS for
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
1613 } else { 1617 } else {
1614 sources -= [ "proxy/proxy_resolver_perftest.cc" ] 1618 sources -= [ "proxy/proxy_resolver_perftest.cc" ]
1615 } 1619 }
1616 1620
1617 if (is_win && icu_use_data_file) { 1621 if (is_win && icu_use_data_file) {
1618 # This is needed to trigger the dll copy step on windows. 1622 # This is needed to trigger the dll copy step on windows.
1619 # TODO(mark): Specifying this here shouldn't be necessary. 1623 # TODO(mark): Specifying this here shouldn't be necessary.
1620 deps += [ "//third_party/icu:icudata" ] 1624 deps += [ "//third_party/icu:icudata" ]
1621 } 1625 }
1622 } 1626 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698