Add net/android/keystore.h

net/net.gyp

Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 15e6c14879d52a2e916cf625512d73277b53fc35..3aa8d4c816aa79c788feb34b0030261f1eb24960 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -56,6 +56,10 @@
         'net_resources',
       ],
       'sources': [
+        'android/keystore.cc',
+        'android/keystore.h',
+        'android/keystore_openssl.cc',
+        'android/keystore_openssl.h',

[Ryan Sleevi, 2013/01/26 01:51:57]

Why is a custom keystore needed? It's Android, it's inherently OpenSSL.

[digit1, 2013/01/28 10:16:30]

It's not a custom keystore, it's separation of concerns, i.e.:

android/keystore.h only provides the native functions to use the platform APIs.
android/keystore_openssl.h provides the function that provides an
OpenSSL-specific wrapper around them.

The main idea is that all OpenSSL-specific code is in
android/keystore_openssl.[ch], while android/keystore.[hc] only contains
JNI-specific code. I prefer to separate them because each one has its own subtle
issues to deal with.

I could rename the second set of files to keystore_openssl_wrapper.h if you
prefer, though the recent Android 4.0 / 4.1 platform bug might require that we
let go of this nice distinction :-/

         'android/gurl_utils.cc',
         'android/gurl_utils.h',
         'android/net_jni_registrar.cc',
@@ -1300,6 +1304,7 @@
         'net_test_support',
       ],
       'sources': [
+        'android/keystore_unittest.cc',
         'android/network_change_notifier_android_unittest.cc',
         'base/address_list_unittest.cc',
         'base/address_tracker_linux_unittest.cc',
@@ -1605,6 +1610,13 @@
             # sense.
             'dns/dns_config_service_posix_unittest.cc',
           ],
+          'dependencies': [
+            'net_javatests',
+            'net_test_jni_headers',
+          ],
+          'include_dirs': [
+            '<(SHARED_INTERMEDIATE_DIR)/net',

[Ryan Sleevi, 2013/01/26 01:51:57]

Why do you need to include this directly? It should be handled by a
'direct_dependent_settings'  from ssl_client_cert_types_java, which should be
export_dependent_settings by net_java

Or am I missing something? What header is being auto-generated?

[digit1, 2013/01/28 10:16:30]

This is needed to include "net/jni_AndroidKeyStoreTestUtil.h" which is
auto-generated from AndroidKeyStoreTestUtil.java. Otherwise,
net/android/keystore_unittest.cc will not compile properly (it won't find the
header).

The non-test code depends on net_resources which has a similar gyp declaration,
which is why it compiles (I suspect this is more unexpected than intentional
though). I'm not too sure how to refactor this in a better way though. I'll try
moving this to net_test_jni_headers as a direct_dependent_settings.

+          ],
         }],
         [ 'use_glib == 1', {
             'dependencies': [
@@ -2315,6 +2327,7 @@
           'target_name': 'net_jni_headers',
           'type': 'none',
           'sources': [
+            'android/java/src/org/chromium/net/AndroidKeyStore.java',
             'android/java/src/org/chromium/net/AndroidNetworkLibrary.java',
             'android/java/src/org/chromium/net/GURLUtils.java',
             'android/java/src/org/chromium/net/NetworkChangeNotifier.java',
@@ -2326,6 +2339,17 @@
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
+          'target_name': 'net_test_jni_headers',
+          'type': 'none',
+          'sources': [
+            'android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java',
+          ],
+          'variables': {
+            'jni_gen_dir': 'net',
+          },
+          'includes': [ '../build/jni_generator.gypi' ],
+        },
+        {
           'target_name': 'net_java',
           'type': 'none',
           'variables': {
@@ -2336,6 +2360,7 @@
             '../base/base.gyp:base',
             'net_errors_java',
             'certificate_mime_types_java',
+            'ssl_client_cert_types_java',
           ],
           'includes': [ '../build/java.gypi' ],
         },
@@ -2386,6 +2411,18 @@
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
+        {
+          'target_name': 'ssl_client_cert_types_java',
+          'type': 'none',
+          'sources': [
+            'android/java/SSLClientCertType.template',
+          ],
+          'variables': {
+            'package_name': 'org.chromium.net',
+            'template_deps': ['base/ssl_client_cert_type_list.h'],
+          },
+          'includes': [ '../build/android/java_cpp_template.gypi' ],
+        },
       ],
     }],
     # Special target to wrap a gtest_target_type==shared_library
@@ -2398,6 +2435,7 @@
           'type': 'none',
           'dependencies': [
             'net_java',
+            'net_javatests',
             'net_unittests',
           ],
           'variables': {