Refactoring AndroidKeyStore to support a KeyStore running in another process

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,
     'use_tracing_cache_backend%': 0,
@@ skipping 3014 matching lines @@
         }
       ]
     }],
     ['OS=="android"', {
       'targets': [
         {
           '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/AndroidKeyStoreBridge.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',
             'android/java/src/org/chromium/net/X509Util.java',
           ],
           'variables': {
             'jni_gen_package': 'net',
             'jni_generator_ptr_type': 'long',
           },
@@ skipping 16 matching lines @@
           'type': 'none',
           'variables': {
             'java_in_dir': '../net/android/java',
           },
           'dependencies': [
             '../base/base.gyp:base',
             'cert_verify_status_android_java',
             'certificate_mime_types_java',
             'net_errors_java',
             'private_key_types_java',
+            'remote_android_keystore_aidl',
           ],
           'includes': [ '../build/java.gypi' ],
         },
         {
+          # Processes the interface files for communication with an Android KeyStore
+          # running in a separate process.
+          'target_name': 'remote_android_keystore_aidl',
+          'type': 'none',
+          'variables': {
+            'aidl_interface_file': '../net/android/java/src/org/chromium/net/interface.aidl',
+          },
+          'sources': [
+            '../net/android/java/src/org/chromium/net/IAndroidKeyStoreRemote.aidl',
+          ],
+          'includes': [ '../build/java_aidl.gypi' ],
+        },
+        {
           'target_name': 'net_java_test_support',
           'type': 'none',
           'variables': {
             'java_in_dir': '../net/test/android/javatests',
           },
           'includes': [ '../build/java.gypi' ],
         },
         {
           'target_name': 'net_javatests',
           'type': 'none',
@@ skipping 106 matching lines @@
             'net_unittests.isolate',
           ],
           'sources': [
             'net_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }