diff options
| author | ryanmyers@chromium.org <ryanmyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 08:32:30 +0000 |
|---|---|---|
| committer | ryanmyers@chromium.org <ryanmyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 08:32:30 +0000 |
| commit | e9c3662f70af48bf571bc515b768ddb31dfe539a (patch) | |
| tree | 66f417933255fc19d9bbd3c6995c62585f3815eb /google_apis/google_apis.gyp | |
| parent | fda3b119daf1a351d53a2e5eb01ff3cb78d00cef (diff) | |
| download | chromium_src-e9c3662f70af48bf571bc515b768ddb31dfe539a.zip chromium_src-e9c3662f70af48bf571bc515b768ddb31dfe539a.tar.gz chromium_src-e9c3662f70af48bf571bc515b768ddb31dfe539a.tar.bz2 | |
Per discussion, implement the Omaha Client Update Protocol (CUP) in src/crypto.
Since this will not be used on Android or iOS, only the NSS implementation is
complete; OpenSSL is stubbed out.
Review URL: https://chromiumcodereview.appspot.com/15793005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204755 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'google_apis/google_apis.gyp')
| -rw-r--r-- | google_apis/google_apis.gyp | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/google_apis/google_apis.gyp b/google_apis/google_apis.gyp index 9a6ec47..9ae23dd 100644 --- a/google_apis/google_apis.gyp +++ b/google_apis/google_apis.gyp @@ -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', |