Add net/android/keystore.h

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,
 
     'linux_link_kerberos%': 0,
     'conditions': [
@@ skipping 38 matching lines @@
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../crypto/crypto.gyp:crypto',
         '../sdch/sdch.gyp:sdch',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/zlib/zlib.gyp:zlib',
         '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',
         'android/net_jni_registrar.h',
         'android/network_change_notifier_android.cc',
         'android/network_change_notifier_android.h',
         'android/network_change_notifier_delegate_android.cc',
         'android/network_change_notifier_delegate_android.h',
         'android/network_change_notifier_factory_android.cc',
         'android/network_change_notifier_factory_android.h',
@@ skipping 1224 matching lines @@
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../crypto/crypto.gyp:crypto',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/zlib/zlib.gyp:zlib',
         'net',
         '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',
         'base/backoff_entry_unittest.cc',
         'base/big_endian_unittest.cc',
         'base/cert_verify_proc_unittest.cc',
         'base/crl_set_unittest.cc',
         'base/data_url_unittest.cc',
         'base/default_server_bound_cert_store_unittest.cc',
         'base/directory_lister_unittest.cc',
@@ skipping 285 matching lines @@
             'base/network_change_notifier_linux_unittest.cc',
             'proxy/proxy_config_service_linux_unittest.cc',
           ],
         }],
         [ 'OS == "android"', {
           'sources!': [
             # No res_ninit() et al on Android, so this doesn't make a lot of
             # 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': [
               '../build/linux/system.gyp:ssl',
             ],
           }, {  # else use_glib == 0: !posix || mac
             'sources!': [
               'base/nss_cert_database_unittest.cc',
             ],
           },
@@ skipping 690 matching lines @@
           ],
         },
       ]
     }],
     ['OS=="android"', {
       'targets': [
         {
           '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',
             'android/java/src/org/chromium/net/ProxyChangeListener.java',
           ],
           'variables': {
             'jni_gen_dir': 'net',
           },
           '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': {
             'package_name': 'net',
             'java_in_dir': '../net/android/java',
           },
           'dependencies': [
             '../base/base.gyp:base',
             'net_errors_java',
             'certificate_mime_types_java',
+            'ssl_client_cert_types_java',
           ],
           'includes': [ '../build/java.gypi' ],
         },
         {
           'target_name': 'net_java_test_support',
           'type': 'none',
           'variables': {
             'package_name': 'net_java_test_support',
             'java_in_dir': '../net/test/android/javatests',
           },
@@ skipping 30 matching lines @@
           'type': 'none',
           'sources': [
             'android/java/CertificateMimeType.template',
           ],
           'variables': {
             'package_name': 'org.chromium.net',
             'template_deps': ['base/mime_util_certificate_type_list.h'],
           },
           '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
     # net_unittests into an android apk for execution.
     # See base.gyp for TODO(jrg)s about this strategy.
     ['OS == "android" and gtest_target_type == "shared_library"', {
       'targets': [
         {
           'target_name': 'net_unittests_apk',
           'type': 'none',
           'dependencies': [
             'net_java',
+            'net_javatests',
             'net_unittests',
           ],
           'variables': {
             'test_suite_name': 'net_unittests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)net_unittests<(SHARED_LIB_SUFFIX)',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
@@ skipping 28 matching lines @@
                 '--result', '<@(_outputs)',
                 '--isolate', 'net_unittests.isolate',
               ],
             },
           ],
         },
       ],
     }],
   ],
 }