Index: net/net.gyp |
diff --git a/net/net.gyp b/net/net.gyp |
index 90fe51f0d78bd4ec57d230de645617e1509fda5d..3fef3a981e14aa43f7c172476691b04aad8be1e1 100644 |
--- a/net/net.gyp |
+++ b/net/net.gyp |
@@ -10,11 +10,11 @@ |
'net_test_extra_libs': [], |
'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"', { |
@@ -223,7 +223,10 @@ |
'defines': [ |
'USE_KERBEROS', |
], |
- }, { # use_kerberos == 0 |
+ }], |
+ [ 'use_kerberos==0 or OS == "android"', { |
+ # These are excluded on Android, because the actual Kerberos support, |
+ # which these test, is in a separate app on Android. |
'sources!': [ |
'http/http_auth_gssapi_posix_unittest.cc', |
'http/http_auth_handler_negotiate_unittest.cc', |
cbentzel
2015/06/11 20:51:43
http_auth_handler_negotate_unittest.cc should stil
aberent
2015/06/15 15:52:20
Unfortunately not, because, as discussed in a rece
|
@@ -1353,6 +1356,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', |
@@ -1489,6 +1493,7 @@ |
'dependencies': [ |
'net_java', |
'net_javatests', |
+ 'net_java_test_support', |
'net_unittests', |
], |
'conditions': [ |
@@ -1510,6 +1515,8 @@ |
'variables': { |
'test_suite_name': 'net_unittests', |
'isolate_file': 'net_unittests.isolate', |
+ 'android_manifest_path': 'android/unittest_support/AndroidManifest.xml', |
+ 'resource_dir': 'android/unittest_support/res', |
'conditions': [ |
['v8_use_external_startup_data==1', { |
'asset_location': '<(PRODUCT_DIR)/net_unittests_apk/assets', |
@@ -1526,6 +1533,26 @@ |
}, |
'includes': [ '../build/apk_test.gypi' ], |
}, |
+ { |
+ 'target_name': 'net_junit_tests', |
+ 'type': 'none', |
+ 'dependencies': [ |
+ 'net_java', |
+ '../base/base.gyp:base', |
+ '../base/base.gyp:base_java_test_support', |
+ '../testing/android/junit/junit_test.gyp:junit_test_support', |
+ ], |
+ 'variables': { |
+ 'main_class': 'org.chromium.testing.local.JunitTestMain', |
+ 'src_paths': [ |
+ 'android/junit/', |
+ ], |
+ }, |
+ 'includes': [ |
+ '../build/host_jar.gypi', |
+ ], |
+ }, |
+ |
], |
}], |
['OS == "android" or OS == "linux"', { |