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

Unified Diff: google_apis/google_apis.gyp

Issue 432953002: Remove CUP from google_apis (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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
diff --git a/google_apis/google_apis.gyp b/google_apis/google_apis.gyp
index 73b2d1120bd4c9eb670be8ab0fa0aa375c0849cb..918097e22209a2079403723a64350755933ade3d 100644
--- a/google_apis/google_apis.gyp
+++ b/google_apis/google_apis.gyp
@@ -37,20 +37,6 @@
'GOOGLE_DEFAULT_CLIENT_SECRET="<(google_default_client_secret)"',
]
}],
- ['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/boringssl/boringssl.gyp:boringssl',
- ],
- 'sources/': [
- ['exclude', 'cup/client_update_protocol_nss\.cc$'],
- ],
- }],
['enable_extensions==1', {
'sources': [
'drive/auth_service.cc',
@@ -84,21 +70,8 @@
'drive/time_util.h',
],
}],
- ['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/account_tracker.cc',
'gaia/account_tracker.h',
'gaia/gaia_auth_consumer.cc',
@@ -162,7 +135,6 @@
],
'sources': [
'google_api_keys_unittest.cc',
- 'cup/client_update_protocol_unittest.cc',
'gaia/account_tracker_unittest.cc',
'gaia/gaia_auth_fetcher_unittest.cc',
'gaia/gaia_auth_util_unittest.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