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

Side by Side Diff: net/net.gyp

Issue 108653013: Export verified_cert and public_key_hashes on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unnecessary NET_EXPORT. Created 6 years, 11 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
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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 53 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
54 '../crypto/crypto.gyp:crypto', 54 '../crypto/crypto.gyp:crypto',
55 '../sdch/sdch.gyp:sdch', 55 '../sdch/sdch.gyp:sdch',
56 '../third_party/icu/icu.gyp:icui18n', 56 '../third_party/icu/icu.gyp:icui18n',
57 '../third_party/icu/icu.gyp:icuuc', 57 '../third_party/icu/icu.gyp:icuuc',
58 '../third_party/zlib/zlib.gyp:zlib', 58 '../third_party/zlib/zlib.gyp:zlib',
59 '../url/url.gyp:url_lib', 59 '../url/url.gyp:url_lib',
60 'net_resources', 60 'net_resources',
61 ], 61 ],
62 'sources': [ 62 'sources': [
63 'android/cert_verify_result_android.cc',
63 'android/cert_verify_result_android.h', 64 'android/cert_verify_result_android.h',
64 'android/cert_verify_result_android_list.h', 65 'android/cert_verify_status_android_list.h',
65 'android/gurl_utils.cc', 66 'android/gurl_utils.cc',
66 'android/gurl_utils.h', 67 'android/gurl_utils.h',
67 'android/keystore.cc', 68 'android/keystore.cc',
68 'android/keystore.h', 69 'android/keystore.h',
69 'android/keystore_openssl.cc', 70 'android/keystore_openssl.cc',
70 'android/keystore_openssl.h', 71 'android/keystore_openssl.h',
71 'android/net_jni_registrar.cc', 72 'android/net_jni_registrar.cc',
72 'android/net_jni_registrar.h', 73 'android/net_jni_registrar.h',
73 'android/network_change_notifier_android.cc', 74 'android/network_change_notifier_android.cc',
74 'android/network_change_notifier_android.h', 75 'android/network_change_notifier_android.h',
(...skipping 2874 matching lines...) Expand 10 before | Expand all | Expand 10 after
2949 ], 2950 ],
2950 } 2951 }
2951 ] 2952 ]
2952 }], 2953 }],
2953 ['OS=="android"', { 2954 ['OS=="android"', {
2954 'targets': [ 2955 'targets': [
2955 { 2956 {
2956 'target_name': 'net_jni_headers', 2957 'target_name': 'net_jni_headers',
2957 'type': 'none', 2958 'type': 'none',
2958 'sources': [ 2959 'sources': [
2960 'android/java/src/org/chromium/net/AndroidCertVerifyResult.java',
2959 'android/java/src/org/chromium/net/AndroidKeyStore.java', 2961 'android/java/src/org/chromium/net/AndroidKeyStore.java',
2960 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java', 2962 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java',
2961 'android/java/src/org/chromium/net/GURLUtils.java', 2963 'android/java/src/org/chromium/net/GURLUtils.java',
2962 'android/java/src/org/chromium/net/NetworkChangeNotifier.java', 2964 'android/java/src/org/chromium/net/NetworkChangeNotifier.java',
2963 'android/java/src/org/chromium/net/ProxyChangeListener.java', 2965 'android/java/src/org/chromium/net/ProxyChangeListener.java',
2964 'android/java/src/org/chromium/net/X509Util.java', 2966 'android/java/src/org/chromium/net/X509Util.java',
2965 ], 2967 ],
2966 'variables': { 2968 'variables': {
2967 'jni_gen_package': 'net', 2969 'jni_gen_package': 'net',
2968 'jni_generator_ptr_type': 'long', 2970 'jni_generator_ptr_type': 'long',
(...skipping 13 matching lines...) Expand all
2982 'includes': [ '../build/jni_generator.gypi' ], 2984 'includes': [ '../build/jni_generator.gypi' ],
2983 }, 2985 },
2984 { 2986 {
2985 'target_name': 'net_java', 2987 'target_name': 'net_java',
2986 'type': 'none', 2988 'type': 'none',
2987 'variables': { 2989 'variables': {
2988 'java_in_dir': '../net/android/java', 2990 'java_in_dir': '../net/android/java',
2989 }, 2991 },
2990 'dependencies': [ 2992 'dependencies': [
2991 '../base/base.gyp:base', 2993 '../base/base.gyp:base',
2992 'cert_verify_result_android_java', 2994 'cert_verify_status_android_java',
2993 'certificate_mime_types_java', 2995 'certificate_mime_types_java',
2994 'net_errors_java', 2996 'net_errors_java',
2995 'private_key_types_java', 2997 'private_key_types_java',
2996 ], 2998 ],
2997 'includes': [ '../build/java.gypi' ], 2999 'includes': [ '../build/java.gypi' ],
2998 }, 3000 },
2999 { 3001 {
3000 'target_name': 'net_java_test_support', 3002 'target_name': 'net_java_test_support',
3001 'type': 'none', 3003 'type': 'none',
3002 'variables': { 3004 'variables': {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
3035 'sources': [ 3037 'sources': [
3036 'android/java/CertificateMimeType.template', 3038 'android/java/CertificateMimeType.template',
3037 ], 3039 ],
3038 'variables': { 3040 'variables': {
3039 'package_name': 'org/chromium/net', 3041 'package_name': 'org/chromium/net',
3040 'template_deps': ['base/mime_util_certificate_type_list.h'], 3042 'template_deps': ['base/mime_util_certificate_type_list.h'],
3041 }, 3043 },
3042 'includes': [ '../build/android/java_cpp_template.gypi' ], 3044 'includes': [ '../build/android/java_cpp_template.gypi' ],
3043 }, 3045 },
3044 { 3046 {
3045 'target_name': 'cert_verify_result_android_java', 3047 'target_name': 'cert_verify_status_android_java',
3046 'type': 'none', 3048 'type': 'none',
3047 'sources': [ 3049 'sources': [
3048 'android/java/CertVerifyResultAndroid.template', 3050 'android/java/CertVerifyStatusAndroid.template',
3049 ], 3051 ],
3050 'variables': { 3052 'variables': {
3051 'package_name': 'org/chromium/net', 3053 'package_name': 'org/chromium/net',
3052 'template_deps': ['android/cert_verify_result_android_list.h'], 3054 'template_deps': ['android/cert_verify_status_android_list.h'],
3053 }, 3055 },
3054 'includes': [ '../build/android/java_cpp_template.gypi' ], 3056 'includes': [ '../build/android/java_cpp_template.gypi' ],
3055 }, 3057 },
3056 { 3058 {
3057 'target_name': 'private_key_types_java', 3059 'target_name': 'private_key_types_java',
3058 'type': 'none', 3060 'type': 'none',
3059 'sources': [ 3061 'sources': [
3060 'android/java/PrivateKeyType.template', 3062 'android/java/PrivateKeyType.template',
3061 ], 3063 ],
3062 'variables': { 3064 'variables': {
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
3116 'net_unittests.isolate', 3118 'net_unittests.isolate',
3117 ], 3119 ],
3118 'sources': [ 3120 'sources': [
3119 'net_unittests.isolate', 3121 'net_unittests.isolate',
3120 ], 3122 ],
3121 }, 3123 },
3122 ], 3124 ],
3123 }], 3125 }],
3124 ], 3126 ],
3125 } 3127 }
OLDNEW
« net/cert/cert_verify_proc_android.cc ('K') | « net/cert/cert_verify_proc_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698