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

Unified Diff: net/net.gyp

Issue 11266008: Fix certificate and keychain installation on Android. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: remove obsolete constants Created 8 years 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
« net/base/cert_database_openssl.cc ('K') | « net/base/mime_util_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 74eb3a86705647b105e1cfd2d0b119ecf26a9f99..abda68173f54ea2cec6c6db9e1d11f0100b4a740 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -2270,6 +2270,7 @@
'dependencies': [
'../base/base.gyp:base',
'net_errors_java',
+ 'certificate_mime_types_java',
],
'includes': [ '../build/java.gypi' ],
},
@@ -2307,7 +2308,19 @@
'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/base/cert_database_openssl.cc ('K') | « net/base/mime_util_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698