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

Unified Diff: google_apis/google_apis.gyp

Issue 15793005: Per discussion, implement the Omaha Client Update Protocol (CUP) in src/crypto. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 6 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
« no previous file with comments | « google_apis/cup/client_update_protocol_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: google_apis/google_apis.gyp
===================================================================
--- google_apis/google_apis.gyp (revision 201321)
+++ google_apis/google_apis.gyp (working copy)
@@ -48,8 +48,29 @@
'GOOGLE_CLIENT_SECRET_REMOTING="<(google_default_client_secret)"',
]
}],
+ [ 'OS == "android"', {
+ 'dependencies': [
+ '../third_party/openssl/openssl.gyp:openssl',
+ ],
+ 'sources/': [
+ ['exclude', 'cup/client_update_protocol_nss\.cc$'],
+ ],
+ }],
+ [ 'use_openssl==1', {
+ 'sources!': [
+ 'cup/client_update_protocol_nss.cc',
+ ],
+ }, {
+ 'sources!': [
+ 'cup/client_update_protocol_openssl.cc',
+ ],
+ },],
],
'sources': [
+ 'cup/client_update_protocol.cc',
+ 'cup/client_update_protocol.h',
+ 'cup/client_update_protocol_nss.cc',
+ 'cup/client_update_protocol_openssl.cc',
'gaia/gaia_auth_consumer.cc',
'gaia/gaia_auth_consumer.h',
'gaia/gaia_auth_fetcher.cc',
« no previous file with comments | « google_apis/cup/client_update_protocol_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698