Support Kerberos on Android

net/net.gyp

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
     # Defines an extra set of libs with an alternate copy of org.apache.http.
     # TODO(yfriedman): Remove this when crbug.com/488192 is fixed.
     '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"', {
         # The way the cache uses mmap() is inefficient on some Android devices.
         # If this flag is set, we hackily avoid using mmap() in the disk cache.
         # We are pretty confident that mmap-ing the index would not hurt any
         # existing x86 android devices, but we cannot be so sure about the
         # variety of ARM devices. So enable it for x86 only for now.
         'posix_avoid_mmap%': 1,
       }, {
@@ skipping 188 matching lines @@
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
         [ 'use_kerberos==1', {
           '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 still be testable on Android. 

[aberent, 2015/06/15 15:52:20]

Unfortunately not, because, as discussed in a recent email thread, it is almost
impossible to mock the generated Kerberos tokens on Android in a c++ unit test
environment.

             'http/mock_gssapi_library_posix.cc',
             'http/mock_gssapi_library_posix.h',
           ],
         }],
         [ 'use_openssl == 1 or (desktop_linux == 0 and chromeos == 0 and OS != "ios")', {
           # Only include this test when on Posix and using NSS for
           # cert verification or on iOS (which also uses NSS for certs).
           'sources!': [
             'cert_net/nss_ocsp_unittest.cc',
           ],
@@ skipping 1106 matching lines @@
         },
         {
           'target_name': 'net_jni_headers',
           'type': 'none',
           'sources': [
             'android/java/src/org/chromium/net/AndroidCertVerifyResult.java',
             'android/java/src/org/chromium/net/AndroidKeyStore.java',
             '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',
             'android/java/src/org/chromium/net/X509Util.java',
           ],
           'variables': {
             'jni_gen_package': 'net',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
@@ skipping 116 matching lines @@
             'source_file': 'android/keystore.h',
           },
           'includes': [ '../build/android/java_cpp_enum.gypi' ],
         },
         {
           'target_name': 'net_unittests_apk',
           'type': 'none',
           'dependencies': [
             'net_java',
             'net_javatests',
+            'net_java_test_support',
             'net_unittests',
           ],
           'conditions': [
             ['v8_use_external_startup_data==1', {
               'dependencies': [
                 '../v8/tools/gyp/v8.gyp:v8_external_snapshot',
               ],
               'copies': [
                 {
                 'destination': '<(asset_location)',
                   'files': [
                     '<(PRODUCT_DIR)/natives_blob.bin',
                     '<(PRODUCT_DIR)/snapshot_blob.bin',
                   ],
                 },
               ],
             }],
           ],
           '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',
                 'additional_input_paths': [
                   '<(PRODUCT_DIR)/net_unittests_apk/assets/natives_blob.bin',
                   '<(PRODUCT_DIR)/net_unittests_apk/assets/snapshot_blob.bin',
                 ],
                 'inputs': [
                   '<(PRODUCT_DIR)/natives_blob.bin',
                   '<(PRODUCT_DIR)/snapshot_blob.bin',
                 ],
               }],
             ],
           },
           '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"', {
       'targets': [
         {
           'target_name': 'disk_cache_memory_test',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
             'net',
@@ skipping 16 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'net_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }