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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_browser.gypi

Issue 313123003: Android: Eliminate sync_file_system extensions code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix tests 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 | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/chrome_renderer.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 2c3e7000882ccff3142af9e376f2231d335944df..9687a911572ded576dcb245a6615b56745f69ea1 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1451,145 +1451,6 @@
'browser/sync/sync_error_notifier_factory_ash.h',
'browser/sync/sync_startup_tracker.cc',
'browser/sync/sync_startup_tracker.h',
- 'browser/sync_file_system/conflict_resolution_policy.h',
- 'browser/sync_file_system/conflict_resolution_resolver.cc',
- 'browser/sync_file_system/conflict_resolution_resolver.h',
- 'browser/sync_file_system/drive_backend/callback_helper.h',
- 'browser/sync_file_system/drive_backend/callback_tracker.cc',
- 'browser/sync_file_system/drive_backend/callback_tracker.h',
- 'browser/sync_file_system/drive_backend/callback_tracker_internal.cc',
- 'browser/sync_file_system/drive_backend/callback_tracker_internal.h',
- 'browser/sync_file_system/drive_backend/conflict_resolver.cc',
- 'browser/sync_file_system/drive_backend/conflict_resolver.h',
- 'browser/sync_file_system/drive_backend/drive_backend_constants.cc',
- 'browser/sync_file_system/drive_backend/drive_backend_constants.h',
- 'browser/sync_file_system/drive_backend/drive_backend_util.cc',
- 'browser/sync_file_system/drive_backend/drive_backend_util.h',
- 'browser/sync_file_system/drive_backend/drive_service_on_worker.cc',
- 'browser/sync_file_system/drive_backend/drive_service_on_worker.h',
- 'browser/sync_file_system/drive_backend/drive_service_wrapper.cc',
- 'browser/sync_file_system/drive_backend/drive_service_wrapper.h',
- 'browser/sync_file_system/drive_backend/drive_uploader_on_worker.cc',
- 'browser/sync_file_system/drive_backend/drive_uploader_on_worker.h',
- 'browser/sync_file_system/drive_backend/drive_uploader_wrapper.cc',
- 'browser/sync_file_system/drive_backend/drive_uploader_wrapper.h',
- 'browser/sync_file_system/drive_backend/folder_creator.cc',
- 'browser/sync_file_system/drive_backend/folder_creator.h',
- 'browser/sync_file_system/drive_backend/list_changes_task.cc',
- 'browser/sync_file_system/drive_backend/list_changes_task.h',
- 'browser/sync_file_system/drive_backend/local_to_remote_syncer.cc',
- 'browser/sync_file_system/drive_backend/local_to_remote_syncer.h',
- 'browser/sync_file_system/drive_backend/metadata_database.cc',
- 'browser/sync_file_system/drive_backend/metadata_database.h',
- 'browser/sync_file_system/drive_backend/metadata_database_index.cc',
- 'browser/sync_file_system/drive_backend/metadata_database_index.h',
- 'browser/sync_file_system/drive_backend/metadata_database_index_interface.h',
- 'browser/sync_file_system/drive_backend/metadata_database_index_on_disk.cc',
- 'browser/sync_file_system/drive_backend/metadata_database_index_on_disk.h',
- 'browser/sync_file_system/drive_backend/metadata_db_migration_util.cc',
- 'browser/sync_file_system/drive_backend/metadata_db_migration_util.h',
- 'browser/sync_file_system/drive_backend/register_app_task.cc',
- 'browser/sync_file_system/drive_backend/register_app_task.h',
- 'browser/sync_file_system/drive_backend/remote_change_processor_on_worker.cc',
- 'browser/sync_file_system/drive_backend/remote_change_processor_on_worker.h',
- 'browser/sync_file_system/drive_backend/remote_change_processor_wrapper.cc',
- 'browser/sync_file_system/drive_backend/remote_change_processor_wrapper.h',
- 'browser/sync_file_system/drive_backend/remote_to_local_syncer.cc',
- 'browser/sync_file_system/drive_backend/remote_to_local_syncer.h',
- 'browser/sync_file_system/drive_backend/sync_engine.cc',
- 'browser/sync_file_system/drive_backend/sync_engine.h',
- 'browser/sync_file_system/drive_backend/sync_engine_context.cc',
- 'browser/sync_file_system/drive_backend/sync_engine_context.h',
- 'browser/sync_file_system/drive_backend/sync_engine_initializer.cc',
- 'browser/sync_file_system/drive_backend/sync_engine_initializer.h',
- 'browser/sync_file_system/drive_backend/sync_task.cc',
- 'browser/sync_file_system/drive_backend/sync_task.h',
- 'browser/sync_file_system/drive_backend/sync_task_manager.cc',
- 'browser/sync_file_system/drive_backend/sync_task_manager.h',
- 'browser/sync_file_system/drive_backend/sync_task_token.cc',
- 'browser/sync_file_system/drive_backend/sync_task_token.h',
- 'browser/sync_file_system/drive_backend/sync_worker.cc',
- 'browser/sync_file_system/drive_backend/sync_worker.h',
- 'browser/sync_file_system/drive_backend/sync_worker_interface.h',
- 'browser/sync_file_system/drive_backend/task_dependency_manager.cc',
- 'browser/sync_file_system/drive_backend/task_dependency_manager.h',
- 'browser/sync_file_system/drive_backend/tracker_id_set.cc',
- 'browser/sync_file_system/drive_backend/tracker_id_set.h',
- 'browser/sync_file_system/drive_backend/uninstall_app_task.cc',
- 'browser/sync_file_system/drive_backend/uninstall_app_task.h',
- 'browser/sync_file_system/drive_backend_v1/api_util.cc',
- 'browser/sync_file_system/drive_backend_v1/api_util.h',
- 'browser/sync_file_system/drive_backend_v1/api_util_interface.h',
- 'browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc',
- 'browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h',
- 'browser/sync_file_system/drive_backend_v1/drive_file_sync_util.cc',
- 'browser/sync_file_system/drive_backend_v1/drive_file_sync_util.h',
- 'browser/sync_file_system/drive_backend_v1/drive_metadata_store.cc',
- 'browser/sync_file_system/drive_backend_v1/drive_metadata_store.h',
- 'browser/sync_file_system/drive_backend_v1/local_sync_delegate.cc',
- 'browser/sync_file_system/drive_backend_v1/local_sync_delegate.h',
- 'browser/sync_file_system/drive_backend_v1/local_sync_operation_resolver.cc',
- 'browser/sync_file_system/drive_backend_v1/local_sync_operation_resolver.h',
- 'browser/sync_file_system/drive_backend_v1/origin_operation_queue.cc',
- 'browser/sync_file_system/drive_backend_v1/origin_operation_queue.h',
- 'browser/sync_file_system/drive_backend_v1/remote_change_handler.cc',
- 'browser/sync_file_system/drive_backend_v1/remote_change_handler.h',
- 'browser/sync_file_system/drive_backend_v1/remote_sync_delegate.cc',
- 'browser/sync_file_system/drive_backend_v1/remote_sync_delegate.h',
- 'browser/sync_file_system/drive_backend_v1/remote_sync_operation_resolver.cc',
- 'browser/sync_file_system/drive_backend_v1/remote_sync_operation_resolver.h',
- 'browser/sync_file_system/file_change.cc',
- 'browser/sync_file_system/file_change.h',
- 'browser/sync_file_system/file_status_observer.h',
- 'browser/sync_file_system/local/local_file_change_tracker.cc',
- 'browser/sync_file_system/local/local_file_change_tracker.h',
- 'browser/sync_file_system/local/local_file_sync_context.cc',
- 'browser/sync_file_system/local/local_file_sync_context.h',
- 'browser/sync_file_system/local/local_file_sync_service.cc',
- 'browser/sync_file_system/local/local_file_sync_service.h',
- 'browser/sync_file_system/local/local_file_sync_status.cc',
- 'browser/sync_file_system/local/local_file_sync_status.h',
- 'browser/sync_file_system/local/local_origin_change_observer.h',
- 'browser/sync_file_system/local/root_delete_helper.cc',
- 'browser/sync_file_system/local/root_delete_helper.h',
- 'browser/sync_file_system/local/sync_file_system_backend.cc',
- 'browser/sync_file_system/local/sync_file_system_backend.h',
- 'browser/sync_file_system/local/syncable_file_operation_runner.cc',
- 'browser/sync_file_system/local/syncable_file_operation_runner.h',
- 'browser/sync_file_system/local/syncable_file_system_operation.cc',
- 'browser/sync_file_system/local/syncable_file_system_operation.h',
- 'browser/sync_file_system/local_change_processor.h',
- 'browser/sync_file_system/logger.cc',
- 'browser/sync_file_system/logger.h',
- 'browser/sync_file_system/remote_change_processor.h',
- 'browser/sync_file_system/remote_file_sync_service.cc',
- 'browser/sync_file_system/remote_file_sync_service.h',
- 'browser/sync_file_system/subtree_set.cc',
- 'browser/sync_file_system/subtree_set.h',
- 'browser/sync_file_system/sync_action.cc',
- 'browser/sync_file_system/sync_action.h',
- 'browser/sync_file_system/sync_callbacks.h',
- 'browser/sync_file_system/sync_direction.h',
- 'browser/sync_file_system/sync_event_observer.h',
- 'browser/sync_file_system/sync_file_metadata.cc',
- 'browser/sync_file_system/sync_file_metadata.h',
- 'browser/sync_file_system/sync_file_status.h',
- 'browser/sync_file_system/sync_file_system_service.cc',
- 'browser/sync_file_system/sync_file_system_service.h',
- 'browser/sync_file_system/sync_file_system_service_factory.cc',
- 'browser/sync_file_system/sync_file_system_service_factory.h',
- 'browser/sync_file_system/sync_file_type.h',
- 'browser/sync_file_system/sync_operation_type.cc',
- 'browser/sync_file_system/sync_operation_type.h',
- 'browser/sync_file_system/sync_process_runner.cc',
- 'browser/sync_file_system/sync_process_runner.h',
- 'browser/sync_file_system/sync_service_state.h',
- 'browser/sync_file_system/sync_status_code.cc',
- 'browser/sync_file_system/sync_status_code.h',
- 'browser/sync_file_system/syncable_file_system_util.cc',
- 'browser/sync_file_system/syncable_file_system_util.h',
- 'browser/sync_file_system/task_logger.cc',
- 'browser/sync_file_system/task_logger.h',
'browser/tab_contents/navigation_metrics_recorder.cc',
'browser/tab_contents/navigation_metrics_recorder.h',
'browser/tab_contents/retargeting_details.h',
@@ -1739,6 +1600,145 @@
'browser/speech/extension_api/tts_engine_extension_api.h',
'browser/speech/extension_api/tts_extension_api.cc',
'browser/speech/extension_api/tts_extension_api.h',
+ 'browser/sync_file_system/conflict_resolution_policy.h',
+ 'browser/sync_file_system/conflict_resolution_resolver.cc',
+ 'browser/sync_file_system/conflict_resolution_resolver.h',
+ 'browser/sync_file_system/drive_backend/callback_helper.h',
+ 'browser/sync_file_system/drive_backend/callback_tracker.cc',
+ 'browser/sync_file_system/drive_backend/callback_tracker.h',
+ 'browser/sync_file_system/drive_backend/callback_tracker_internal.cc',
+ 'browser/sync_file_system/drive_backend/callback_tracker_internal.h',
+ 'browser/sync_file_system/drive_backend/conflict_resolver.cc',
+ 'browser/sync_file_system/drive_backend/conflict_resolver.h',
+ 'browser/sync_file_system/drive_backend/drive_backend_constants.cc',
+ 'browser/sync_file_system/drive_backend/drive_backend_constants.h',
+ 'browser/sync_file_system/drive_backend/drive_backend_util.cc',
+ 'browser/sync_file_system/drive_backend/drive_backend_util.h',
+ 'browser/sync_file_system/drive_backend/drive_service_on_worker.cc',
+ 'browser/sync_file_system/drive_backend/drive_service_on_worker.h',
+ 'browser/sync_file_system/drive_backend/drive_service_wrapper.cc',
+ 'browser/sync_file_system/drive_backend/drive_service_wrapper.h',
+ 'browser/sync_file_system/drive_backend/drive_uploader_on_worker.cc',
+ 'browser/sync_file_system/drive_backend/drive_uploader_on_worker.h',
+ 'browser/sync_file_system/drive_backend/drive_uploader_wrapper.cc',
+ 'browser/sync_file_system/drive_backend/drive_uploader_wrapper.h',
+ 'browser/sync_file_system/drive_backend/folder_creator.cc',
+ 'browser/sync_file_system/drive_backend/folder_creator.h',
+ 'browser/sync_file_system/drive_backend/list_changes_task.cc',
+ 'browser/sync_file_system/drive_backend/list_changes_task.h',
+ 'browser/sync_file_system/drive_backend/local_to_remote_syncer.cc',
+ 'browser/sync_file_system/drive_backend/local_to_remote_syncer.h',
+ 'browser/sync_file_system/drive_backend/metadata_database.cc',
+ 'browser/sync_file_system/drive_backend/metadata_database.h',
+ 'browser/sync_file_system/drive_backend/metadata_database_index.cc',
+ 'browser/sync_file_system/drive_backend/metadata_database_index.h',
+ 'browser/sync_file_system/drive_backend/metadata_database_index_interface.h',
+ 'browser/sync_file_system/drive_backend/metadata_database_index_on_disk.cc',
+ 'browser/sync_file_system/drive_backend/metadata_database_index_on_disk.h',
+ 'browser/sync_file_system/drive_backend/metadata_db_migration_util.cc',
+ 'browser/sync_file_system/drive_backend/metadata_db_migration_util.h',
+ 'browser/sync_file_system/drive_backend/register_app_task.cc',
+ 'browser/sync_file_system/drive_backend/register_app_task.h',
+ 'browser/sync_file_system/drive_backend/remote_change_processor_on_worker.cc',
+ 'browser/sync_file_system/drive_backend/remote_change_processor_on_worker.h',
+ 'browser/sync_file_system/drive_backend/remote_change_processor_wrapper.cc',
+ 'browser/sync_file_system/drive_backend/remote_change_processor_wrapper.h',
+ 'browser/sync_file_system/drive_backend/remote_to_local_syncer.cc',
+ 'browser/sync_file_system/drive_backend/remote_to_local_syncer.h',
+ 'browser/sync_file_system/drive_backend/sync_engine.cc',
+ 'browser/sync_file_system/drive_backend/sync_engine.h',
+ 'browser/sync_file_system/drive_backend/sync_engine_context.cc',
+ 'browser/sync_file_system/drive_backend/sync_engine_context.h',
+ 'browser/sync_file_system/drive_backend/sync_engine_initializer.cc',
+ 'browser/sync_file_system/drive_backend/sync_engine_initializer.h',
+ 'browser/sync_file_system/drive_backend/sync_task.cc',
+ 'browser/sync_file_system/drive_backend/sync_task.h',
+ 'browser/sync_file_system/drive_backend/sync_task_manager.cc',
+ 'browser/sync_file_system/drive_backend/sync_task_manager.h',
+ 'browser/sync_file_system/drive_backend/sync_task_token.cc',
+ 'browser/sync_file_system/drive_backend/sync_task_token.h',
+ 'browser/sync_file_system/drive_backend/sync_worker.cc',
+ 'browser/sync_file_system/drive_backend/sync_worker.h',
+ 'browser/sync_file_system/drive_backend/sync_worker_interface.h',
+ 'browser/sync_file_system/drive_backend/task_dependency_manager.cc',
+ 'browser/sync_file_system/drive_backend/task_dependency_manager.h',
+ 'browser/sync_file_system/drive_backend/tracker_id_set.cc',
+ 'browser/sync_file_system/drive_backend/tracker_id_set.h',
+ 'browser/sync_file_system/drive_backend/uninstall_app_task.cc',
+ 'browser/sync_file_system/drive_backend/uninstall_app_task.h',
+ 'browser/sync_file_system/drive_backend_v1/api_util.cc',
+ 'browser/sync_file_system/drive_backend_v1/api_util.h',
+ 'browser/sync_file_system/drive_backend_v1/api_util_interface.h',
+ 'browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc',
+ 'browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h',
+ 'browser/sync_file_system/drive_backend_v1/drive_file_sync_util.cc',
+ 'browser/sync_file_system/drive_backend_v1/drive_file_sync_util.h',
+ 'browser/sync_file_system/drive_backend_v1/drive_metadata_store.cc',
+ 'browser/sync_file_system/drive_backend_v1/drive_metadata_store.h',
+ 'browser/sync_file_system/drive_backend_v1/local_sync_delegate.cc',
+ 'browser/sync_file_system/drive_backend_v1/local_sync_delegate.h',
+ 'browser/sync_file_system/drive_backend_v1/local_sync_operation_resolver.cc',
+ 'browser/sync_file_system/drive_backend_v1/local_sync_operation_resolver.h',
+ 'browser/sync_file_system/drive_backend_v1/origin_operation_queue.cc',
+ 'browser/sync_file_system/drive_backend_v1/origin_operation_queue.h',
+ 'browser/sync_file_system/drive_backend_v1/remote_change_handler.cc',
+ 'browser/sync_file_system/drive_backend_v1/remote_change_handler.h',
+ 'browser/sync_file_system/drive_backend_v1/remote_sync_delegate.cc',
+ 'browser/sync_file_system/drive_backend_v1/remote_sync_delegate.h',
+ 'browser/sync_file_system/drive_backend_v1/remote_sync_operation_resolver.cc',
+ 'browser/sync_file_system/drive_backend_v1/remote_sync_operation_resolver.h',
+ 'browser/sync_file_system/file_change.cc',
+ 'browser/sync_file_system/file_change.h',
+ 'browser/sync_file_system/file_status_observer.h',
+ 'browser/sync_file_system/local/local_file_change_tracker.cc',
+ 'browser/sync_file_system/local/local_file_change_tracker.h',
+ 'browser/sync_file_system/local/local_file_sync_context.cc',
+ 'browser/sync_file_system/local/local_file_sync_context.h',
+ 'browser/sync_file_system/local/local_file_sync_service.cc',
+ 'browser/sync_file_system/local/local_file_sync_service.h',
+ 'browser/sync_file_system/local/local_file_sync_status.cc',
+ 'browser/sync_file_system/local/local_file_sync_status.h',
+ 'browser/sync_file_system/local/local_origin_change_observer.h',
+ 'browser/sync_file_system/local/root_delete_helper.cc',
+ 'browser/sync_file_system/local/root_delete_helper.h',
+ 'browser/sync_file_system/local/sync_file_system_backend.cc',
+ 'browser/sync_file_system/local/sync_file_system_backend.h',
+ 'browser/sync_file_system/local/syncable_file_operation_runner.cc',
+ 'browser/sync_file_system/local/syncable_file_operation_runner.h',
+ 'browser/sync_file_system/local/syncable_file_system_operation.cc',
+ 'browser/sync_file_system/local/syncable_file_system_operation.h',
+ 'browser/sync_file_system/local_change_processor.h',
+ 'browser/sync_file_system/logger.cc',
+ 'browser/sync_file_system/logger.h',
+ 'browser/sync_file_system/remote_change_processor.h',
+ 'browser/sync_file_system/remote_file_sync_service.cc',
+ 'browser/sync_file_system/remote_file_sync_service.h',
+ 'browser/sync_file_system/subtree_set.cc',
+ 'browser/sync_file_system/subtree_set.h',
+ 'browser/sync_file_system/sync_action.cc',
+ 'browser/sync_file_system/sync_action.h',
+ 'browser/sync_file_system/sync_callbacks.h',
+ 'browser/sync_file_system/sync_direction.h',
+ 'browser/sync_file_system/sync_event_observer.h',
+ 'browser/sync_file_system/sync_file_metadata.cc',
+ 'browser/sync_file_system/sync_file_metadata.h',
+ 'browser/sync_file_system/sync_file_status.h',
+ 'browser/sync_file_system/sync_file_system_service.cc',
+ 'browser/sync_file_system/sync_file_system_service.h',
+ 'browser/sync_file_system/sync_file_system_service_factory.cc',
+ 'browser/sync_file_system/sync_file_system_service_factory.h',
+ 'browser/sync_file_system/sync_file_type.h',
+ 'browser/sync_file_system/sync_operation_type.cc',
+ 'browser/sync_file_system/sync_operation_type.h',
+ 'browser/sync_file_system/sync_process_runner.cc',
+ 'browser/sync_file_system/sync_process_runner.h',
+ 'browser/sync_file_system/sync_service_state.h',
+ 'browser/sync_file_system/sync_status_code.cc',
+ 'browser/sync_file_system/sync_status_code.h',
+ 'browser/sync_file_system/syncable_file_system_util.cc',
+ 'browser/sync_file_system/syncable_file_system_util.h',
+ 'browser/sync_file_system/task_logger.cc',
+ 'browser/sync_file_system/task_logger.h',
],
'chrome_browser_background_sources': [
'browser/background/background_application_list_model.cc',
@@ -2931,8 +2931,6 @@
'common/extensions/api/api.gyp:chrome_api',
'debugger',
'installer_util',
- 'sync_file_system_drive_proto',
- 'sync_file_system_proto',
'../third_party/re2/re2.gyp:re2',
'../cc/cc.gyp:cc',
'../components/components.gyp:autofill_content_browser',
@@ -3043,6 +3041,10 @@
]},
],
['enable_extensions==1', {
+ 'dependencies': [
+ 'sync_file_system_drive_proto',
+ 'sync_file_system_proto',
+ ],
'sources': [ '<@(chrome_browser_extensions_sources)' ],
}],
['enable_background==1', {
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/chrome_renderer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698