Skip to content

Commit

Permalink
Android: Exclude google drive code.
Browse files Browse the repository at this point in the history 
TBR=rogerta@chromium.org

Review URL: https://codereview.chromium.org/372843006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282001 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
thestig@chromium.org committed Jul 9, 2014
1 parent 2473016 commit 71c588a
Show file tree
Hide file tree
Showing 4 changed files with 133 additions and 118 deletions.
36 changes: 18 additions & 18 deletions chrome/chrome_browser.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -409,24 +409,6 @@
'browser/download/drag_download_item.h',
'browser/download/save_package_file_picker.cc',
'browser/download/save_package_file_picker.h',
'browser/drive/drive_app_registry.cc',
'browser/drive/drive_app_registry.h',
'browser/drive/drive_app_registry_observer.h',
'browser/drive/drive_api_service.cc',
'browser/drive/drive_api_service.h',
'browser/drive/drive_api_util.cc',
'browser/drive/drive_api_util.h',
'browser/drive/drive_notification_manager.cc',
'browser/drive/drive_notification_manager.h',
'browser/drive/drive_notification_manager_factory.cc',
'browser/drive/drive_notification_manager_factory.h',
'browser/drive/drive_notification_observer.h',
'browser/drive/drive_service_interface.cc',
'browser/drive/drive_service_interface.h',
'browser/drive/drive_uploader.cc',
'browser/drive/drive_uploader.h',
'browser/drive/event_logger.cc',
'browser/drive/event_logger.h',
'browser/enumerate_modules_model_win.cc',
'browser/enumerate_modules_model_win.h',
'browser/extensions/signin/gaia_auth_extension_loader.cc',
Expand Down Expand Up @@ -1507,6 +1489,24 @@
'browser/content_settings/content_settings_custom_extension_provider.h',
'browser/content_settings/content_settings_internal_extension_provider.cc',
'browser/content_settings/content_settings_internal_extension_provider.h',
'browser/drive/drive_app_registry.cc',
'browser/drive/drive_app_registry.h',
'browser/drive/drive_app_registry_observer.h',
'browser/drive/drive_api_service.cc',
'browser/drive/drive_api_service.h',
'browser/drive/drive_api_util.cc',
'browser/drive/drive_api_util.h',
'browser/drive/drive_notification_manager.cc',
'browser/drive/drive_notification_manager.h',
'browser/drive/drive_notification_manager_factory.cc',
'browser/drive/drive_notification_manager_factory.h',
'browser/drive/drive_notification_observer.h',
'browser/drive/drive_service_interface.cc',
'browser/drive/drive_service_interface.h',
'browser/drive/drive_uploader.cc',
'browser/drive/drive_uploader.h',
'browser/drive/event_logger.cc',
'browser/drive/event_logger.h',
'browser/guest_view/app_view/app_view_guest.cc',
'browser/guest_view/app_view/app_view_guest.h',
'browser/guest_view/guest_view_constants.cc',
Expand Down
12 changes: 8 additions & 4 deletions chrome/chrome_tests_unit.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,14 +375,17 @@
['exclude', '^renderer/printing/mock_printer.h'],
],
}],
['enable_extensions==0', {
'sources/': [
['exclude', '^browser/drive/'],
['exclude', '^browser/extensions/api/messaging/native_messaging_'],
['exclude', '^browser/media_galleries/'],
],
}],
['OS=="android"', {
'dependencies!': [
'../components/components.gyp:storage_monitor_test_support',
],
'sources/': [
['exclude', '^browser/media_galleries/'],
['exclude', '^browser/extensions/api/messaging/native_messaging_'],
],
}],
['OS=="win"', {
'dependencies': [
Expand Down Expand Up @@ -2111,6 +2114,7 @@
'sources/': [
['exclude', '^../apps/'],
['exclude', '^../extensions/'],
['exclude', '^browser/drive/'],
['exclude', '^browser/extensions/activity_log/'],
['exclude', '^browser/extensions/api/'],
['exclude', '^browser/extensions/error_console/'],
Expand Down
100 changes: 53 additions & 47 deletions google_apis/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# found in the LICENSE file.

import("//build/config/crypto.gni")
import("//build/config/features.gni")

declare_args() {
# You can set the variable 'use_official_google_api_keys' to true
Expand Down Expand Up @@ -79,36 +80,6 @@ source_set("google_apis") {
sources = [
"cup/client_update_protocol.cc",
"cup/client_update_protocol.h",
"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/gaia_auth_consumer.cc",
"gaia/gaia_auth_consumer.h",
"gaia/gaia_auth_fetcher.cc",
Expand Down Expand Up @@ -167,14 +138,45 @@ source_set("google_apis") {
} else {
sources += [ "cup/client_update_protocol_nss.cc" ]
}

if (enable_extensions) {
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",
]
}
}

source_set("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",
Expand All @@ -193,23 +195,21 @@ source_set("test_support") {
"//net:test_support",
]
forward_dependent_configs_from = deps

if (enable_extensions) {
sources += [
"drive/dummy_auth_service.cc",
"drive/dummy_auth_service.h",
"drive/test_util.cc",
"drive/test_util.h",
]
}
}

test("google_apis_unittest") {
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/gaia_auth_fetcher_unittest.cc",
"gaia/gaia_auth_util_unittest.cc",
"gaia/gaia_oauth_client_unittest.cc",
Expand All @@ -234,13 +234,19 @@ test("google_apis_unittest") {
"//testing/gtest",
]

if (is_android) {
sources -= [
if (enable_extensions) {
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",
]
}
}
103 changes: 54 additions & 49 deletions google_apis/google_apis.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,54 @@
'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',
],
'sources/': [
['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',
Expand All @@ -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',
Expand Down Expand Up @@ -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',
Expand All @@ -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',
],
}],
],
Expand All @@ -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',
Expand All @@ -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',
],
}],
],
},
],
}

0 comments on commit 71c588a

Please sign in to comment.