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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: google_apis/google_apis.gyp

Issue 372843006: Android: Exclude google drive code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix GN 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/BUILD.gn ('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 77dfce9c5d67cf5653036a1f008e7465c929d92b..1d2642f1566b5a1c58f993e53bba0b06e5515391 100644
--- a/google_apis/google_apis.gyp
+++ b/google_apis/google_apis.gyp
@@ -36,13 +36,13 @@
'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"', {
+ ['OS=="android"', {
'dependencies': [
'../third_party/openssl/openssl.gyp:openssl',
],
@@ -50,6 +50,40 @@
['exclude', 'cup/client_update_protocol_nss\.cc$'],
],
}],
+ ['enable_extensions==1', {
+ 'sources': [
+ 'drive/auth_service.cc',
+ 'drive/auth_service.h',
+ 'drive/auth_service_interface.h',
+ 'drive/auth_service_observer.h',
+ 'drive/base_requests.cc',
+ 'drive/base_requests.h',
+ 'drive/drive_api_parser.cc',
+ 'drive/drive_api_parser.h',
+ 'drive/drive_api_requests.cc',
+ 'drive/drive_api_requests.h',
+ 'drive/drive_api_url_generator.cc',
+ 'drive/drive_api_url_generator.h',
+ 'drive/drive_common_callbacks.h',
+ 'drive/drive_entry_kinds.h',
+ 'drive/gdata_errorcode.cc',
+ 'drive/gdata_errorcode.h',
+ 'drive/gdata_wapi_requests.cc',
+ 'drive/gdata_wapi_requests.h',
+ 'drive/gdata_wapi_parser.cc',
+ 'drive/gdata_wapi_parser.h',
+ 'drive/gdata_wapi_url_generator.cc',
+ 'drive/gdata_wapi_url_generator.h',
+ 'drive/request_sender.cc',
+ 'drive/request_sender.h',
+ 'drive/request_util.cc',
+ 'drive/request_util.h',
+ 'drive/task_util.cc',
+ 'drive/task_util.h',
+ 'drive/time_util.cc',
+ 'drive/time_util.h',
+ ],
+ }],
['use_openssl==1', {
'sources!': [
'cup/client_update_protocol_nss.cc',
@@ -65,36 +99,6 @@
'cup/client_update_protocol.h',
'cup/client_update_protocol_nss.cc',
'cup/client_update_protocol_openssl.cc',
- 'drive/auth_service.cc',
- 'drive/auth_service.h',
- 'drive/auth_service_interface.h',
- 'drive/auth_service_observer.h',
- 'drive/base_requests.cc',
- 'drive/base_requests.h',
- 'drive/drive_api_parser.cc',
- 'drive/drive_api_parser.h',
- 'drive/drive_api_requests.cc',
- 'drive/drive_api_requests.h',
- 'drive/drive_api_url_generator.cc',
- 'drive/drive_api_url_generator.h',
- 'drive/drive_common_callbacks.h',
- 'drive/drive_entry_kinds.h',
- 'drive/gdata_errorcode.cc',
- 'drive/gdata_errorcode.h',
- 'drive/gdata_wapi_requests.cc',
- 'drive/gdata_wapi_requests.h',
- 'drive/gdata_wapi_parser.cc',
- 'drive/gdata_wapi_parser.h',
- 'drive/gdata_wapi_url_generator.cc',
- 'drive/gdata_wapi_url_generator.h',
- 'drive/request_sender.cc',
- 'drive/request_sender.h',
- 'drive/request_util.cc',
- 'drive/request_util.h',
- 'drive/task_util.cc',
- 'drive/task_util.h',
- 'drive/time_util.cc',
- 'drive/time_util.h',
'gaia/account_tracker.cc',
'gaia/account_tracker.h',
'gaia/gaia_auth_consumer.cc',
@@ -159,17 +163,6 @@
'sources': [
'google_api_keys_unittest.cc',
'cup/client_update_protocol_unittest.cc',
- 'drive/base_requests_unittest.cc',
- 'drive/base_requests_server_unittest.cc',
- 'drive/drive_api_requests_unittest.cc',
- 'drive/drive_api_parser_unittest.cc',
- 'drive/drive_api_url_generator_unittest.cc',
- 'drive/gdata_wapi_parser_unittest.cc',
- 'drive/gdata_wapi_requests_unittest.cc',
- 'drive/gdata_wapi_url_generator_unittest.cc',
- 'drive/request_sender_unittest.cc',
- 'drive/request_util_unittest.cc',
- 'drive/time_util_unittest.cc',
'gaia/account_tracker_unittest.cc',
'gaia/gaia_auth_fetcher_unittest.cc',
'gaia/gaia_auth_util_unittest.cc',
@@ -185,13 +178,19 @@
'gaia/ubertoken_fetcher_unittest.cc',
],
'conditions': [
- ['OS=="android"', {
- 'sources!': [
+ ['enable_extensions==1', {
+ 'sources': [
'drive/base_requests_server_unittest.cc',
+ 'drive/base_requests_unittest.cc',
'drive/drive_api_parser_unittest.cc',
'drive/drive_api_requests_unittest.cc',
+ 'drive/drive_api_url_generator_unittest.cc',
'drive/gdata_wapi_parser_unittest.cc',
'drive/gdata_wapi_requests_unittest.cc',
+ 'drive/gdata_wapi_url_generator_unittest.cc',
+ 'drive/request_sender_unittest.cc',
+ 'drive/request_util_unittest.cc',
+ 'drive/time_util_unittest.cc',
],
}],
],
@@ -212,10 +211,6 @@
'../net/net.gyp:net_test_support',
],
'sources': [
- 'drive/dummy_auth_service.cc',
- 'drive/dummy_auth_service.h',
- 'drive/test_util.cc',
- 'drive/test_util.h',
'gaia/fake_gaia.cc',
'gaia/fake_gaia.h',
'gaia/fake_identity_provider.cc',
@@ -226,6 +221,16 @@
'gaia/oauth2_token_service_test_util.cc',
'gaia/oauth2_token_service_test_util.h',
],
+ 'conditions': [
+ ['enable_extensions==1', {
+ 'sources': [
+ 'drive/dummy_auth_service.cc',
+ 'drive/dummy_auth_service.h',
+ 'drive/test_util.cc',
+ 'drive/test_util.h',
+ ],
+ }],
+ ],
},
],
}
« no previous file with comments | « google_apis/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698