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

Unified Diff: google_apis/google_apis.gyp

Issue 301973009: Add browser-global GCMDriver (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix build on Android. Created 6 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/gaia/dummy_identity_provider.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
diff --git a/google_apis/google_apis.gyp b/google_apis/google_apis.gyp
index 1fa476c5ed2ec8b4859cd68d04426bf71805eb74..0d9902620205e7c60aa0907814b3f223dd606e92 100644
--- a/google_apis/google_apis.gyp
+++ b/google_apis/google_apis.gyp
@@ -36,29 +36,35 @@
'GOOGLE_DEFAULT_CLIENT_SECRET="<(google_default_client_secret)"',
]
}],
- [ 'OS == "mac" or OS == "ios" or OS == "win"', {
+ ['OS == "mac" or OS == "ios" or OS == "win"', {
'dependencies': [
'../third_party/nss/nss.gyp:nspr',
'../third_party/nss/nss.gyp:nss',
],
}],
- [ 'OS == "android"', {
- 'dependencies': [
- '../third_party/openssl/openssl.gyp:openssl',
- ],
- 'sources/': [
- ['exclude', 'cup/client_update_protocol_nss\.cc$'],
- ],
+ ['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',
+ ],
+ }],
+ ['chromeos==1 or OS == "android"', {
+ 'sources!': [
+ 'gaia/dummy_identity_provider.cc',
+ 'gaia/dummy_identity_provider.h',
+ ]
}],
- [ 'use_openssl==1', {
- 'sources!': [
- 'cup/client_update_protocol_nss.cc',
- ],
- }, {
- 'sources!': [
- 'cup/client_update_protocol_openssl.cc',
- ],
- },],
],
'sources': [
'cup/client_update_protocol.cc',
@@ -95,6 +101,8 @@
'drive/task_util.h',
'drive/time_util.cc',
'drive/time_util.h',
+ 'gaia/dummy_identity_provider.cc',
+ 'gaia/dummy_identity_provider.h',
'gaia/gaia_auth_consumer.cc',
'gaia/gaia_auth_consumer.h',
'gaia/gaia_auth_fetcher.cc',
« no previous file with comments | « google_apis/gaia/dummy_identity_provider.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698