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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 5782b7aadf290c19046c712fba22d0c92efdfa31..01344be90a2723dca7364215c0f977bb8c6da491 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -60,8 +60,9 @@
'net_resources',
],
'sources': [
+ 'android/cert_verify_result_android.cc',
'android/cert_verify_result_android.h',
- 'android/cert_verify_result_android_list.h',
+ 'android/cert_verify_status_android_list.h',
'android/gurl_utils.cc',
'android/gurl_utils.h',
'android/keystore.cc',
@@ -2956,6 +2957,7 @@
'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/AndroidNetworkLibrary.java',
'android/java/src/org/chromium/net/GURLUtils.java',
@@ -2989,7 +2991,7 @@
},
'dependencies': [
'../base/base.gyp:base',
- 'cert_verify_result_android_java',
+ 'cert_verify_status_android_java',
'certificate_mime_types_java',
'net_errors_java',
'private_key_types_java',
@@ -3042,14 +3044,14 @@
'includes': [ '../build/android/java_cpp_template.gypi' ],
},
{
- 'target_name': 'cert_verify_result_android_java',
+ 'target_name': 'cert_verify_status_android_java',
'type': 'none',
'sources': [
- 'android/java/CertVerifyResultAndroid.template',
+ 'android/java/CertVerifyStatusAndroid.template',
],
'variables': {
'package_name': 'org/chromium/net',
- 'template_deps': ['android/cert_verify_result_android_list.h'],
+ 'template_deps': ['android/cert_verify_status_android_list.h'],
},
'includes': [ '../build/android/java_cpp_template.gypi' ],
},
« 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