Fix certificate and keychain installation on Android.

net/net.gyp

 # Copyright (c) 2012 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 66 matching lines @@
         'base/auth.h',
         'base/backoff_entry.cc',
         'base/backoff_entry.h',
         'base/bandwidth_metrics.cc',
         'base/bandwidth_metrics.h',
         'base/big_endian.cc',
         'base/big_endian.h',
         'base/cache_type.h',
         'base/cert_database.cc',
         'base/cert_database.h',
+        'base/cert_database_android.cc',
         'base/cert_database_ios.cc',
         'base/cert_database_mac.cc',
         'base/cert_database_nss.cc',
         'base/cert_database_openssl.cc',
         'base/cert_database_win.cc',
         'base/cert_status_flags.cc',
         'base/cert_status_flags.h',
         'base/cert_verifier.cc',
         'base/cert_verifier.h',
         'base/cert_verify_proc.cc',
@@ skipping 1105 matching lines @@
           'dependencies': [
              'net_java',
           ],
         }],
         [ 'OS == "android"', {
             'dependencies': [
               '../third_party/openssl/openssl.gyp:openssl',
               'net_jni_headers',
             ],
             'sources!': [
+              'base/cert_database_openssl.cc',
               'base/openssl_memory_private_key_store.cc',
             ],
           }, {  # else OS! = "android"
             'defines': [
               # These are the features Android doesn't support.
               'ENABLE_MEDIA_CODEC_THEORA',
             ],
           },
         ],
         [ 'OS == "linux"', {
@@ skipping 1041 matching lines @@
         {
           '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',
           ],
           '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 17 matching lines @@
           'target_name': 'net_errors_java',
           'type': 'none',
           'sources': [
             'base/net_error_list.h',
             'android/java/NetError.template',
           ],
           'variables': {
             'package_name': 'org.chromium.net',
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
-        }
+        },
+        {
+          'target_name': 'certificate_mime_types_java',
+          'type': 'none',
+          'sources': [
+            'base/mime_util_certificate_type_list.h',
+            'android/java/CertificateMimeType.template',
+          ],
+          'variables': {
+            'package_name': 'org.chromium.net',
+          },
+          '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',
@@ skipping 40 matching lines @@
                 '--result', '<@(_outputs)',
                 '--isolate', 'net_unittests.isolate',
               ],
             },
           ],
         },
       ],
     }],
   ],
 }