Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(908)

Side by Side Diff: net/net.gyp

Issue 166143002: Refactoring AndroidKeyStore to support a KeyStore running in another process (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« net/android/keystore.cc ('K') | « net/android/net_jni_registrar.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'use_tracing_cache_backend%': 0, 10 'use_tracing_cache_backend%': 0,
(...skipping 3014 matching lines...) Expand 10 before | Expand all | Expand 10 after
3025 } 3025 }
3026 ] 3026 ]
3027 }], 3027 }],
3028 ['OS=="android"', { 3028 ['OS=="android"', {
3029 'targets': [ 3029 'targets': [
3030 { 3030 {
3031 'target_name': 'net_jni_headers', 3031 'target_name': 'net_jni_headers',
3032 'type': 'none', 3032 'type': 'none',
3033 'sources': [ 3033 'sources': [
3034 'android/java/src/org/chromium/net/AndroidCertVerifyResult.java', 3034 'android/java/src/org/chromium/net/AndroidCertVerifyResult.java',
3035 'android/java/src/org/chromium/net/AndroidKeyStore.java', 3035 'android/java/src/org/chromium/net/AndroidKeyStoreBridge.java',
3036 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java', 3036 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java',
3037 'android/java/src/org/chromium/net/GURLUtils.java', 3037 'android/java/src/org/chromium/net/GURLUtils.java',
3038 'android/java/src/org/chromium/net/NetworkChangeNotifier.java', 3038 'android/java/src/org/chromium/net/NetworkChangeNotifier.java',
3039 'android/java/src/org/chromium/net/ProxyChangeListener.java', 3039 'android/java/src/org/chromium/net/ProxyChangeListener.java',
3040 'android/java/src/org/chromium/net/X509Util.java', 3040 'android/java/src/org/chromium/net/X509Util.java',
3041 ], 3041 ],
3042 'variables': { 3042 'variables': {
3043 'jni_gen_package': 'net', 3043 'jni_gen_package': 'net',
3044 'jni_generator_ptr_type': 'long', 3044 'jni_generator_ptr_type': 'long',
3045 }, 3045 },
(...skipping 16 matching lines...) Expand all
3062 'type': 'none', 3062 'type': 'none',
3063 'variables': { 3063 'variables': {
3064 'java_in_dir': '../net/android/java', 3064 'java_in_dir': '../net/android/java',
3065 }, 3065 },
3066 'dependencies': [ 3066 'dependencies': [
3067 '../base/base.gyp:base', 3067 '../base/base.gyp:base',
3068 'cert_verify_status_android_java', 3068 'cert_verify_status_android_java',
3069 'certificate_mime_types_java', 3069 'certificate_mime_types_java',
3070 'net_errors_java', 3070 'net_errors_java',
3071 'private_key_types_java', 3071 'private_key_types_java',
3072 'remote_android_keystore_aidl',
3072 ], 3073 ],
3073 'includes': [ '../build/java.gypi' ], 3074 'includes': [ '../build/java.gypi' ],
3074 }, 3075 },
3075 { 3076 {
3077 # Processes the interface files for communication with an Android KeyS tore
3078 # running in a separate process.
3079 'target_name': 'remote_android_keystore_aidl',
3080 'type': 'none',
3081 'variables': {
3082 'aidl_interface_file': '../net/android/java/src/org/chromium/net/int erface.aidl',
3083 },
3084 'sources': [
3085 '../net/android/java/src/org/chromium/net/IAndroidKeyStoreRemote.aid l',
3086 ],
3087 'includes': [ '../build/java_aidl.gypi' ],
3088 },
3089 {
3076 'target_name': 'net_java_test_support', 3090 'target_name': 'net_java_test_support',
3077 'type': 'none', 3091 'type': 'none',
3078 'variables': { 3092 'variables': {
3079 'java_in_dir': '../net/test/android/javatests', 3093 'java_in_dir': '../net/test/android/javatests',
3080 }, 3094 },
3081 'includes': [ '../build/java.gypi' ], 3095 'includes': [ '../build/java.gypi' ],
3082 }, 3096 },
3083 { 3097 {
3084 'target_name': 'net_javatests', 3098 'target_name': 'net_javatests',
3085 'type': 'none', 3099 'type': 'none',
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
3192 'net_unittests.isolate', 3206 'net_unittests.isolate',
3193 ], 3207 ],
3194 'sources': [ 3208 'sources': [
3195 'net_unittests.isolate', 3209 'net_unittests.isolate',
3196 ], 3210 ],
3197 }, 3211 },
3198 ], 3212 ],
3199 }], 3213 }],
3200 ], 3214 ],
3201 } 3215 }
OLDNEW
« net/android/keystore.cc ('K') | « net/android/net_jni_registrar.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698