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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/sync.gyp

Issue 11348052: [sync] Componentize sync: Part 1: Clean up sync.gyp and update chrome / test dependencies (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Detailed fixes to sync.gyp Created 8 years, 1 month 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 | « net/net.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/sync.gyp
diff --git a/sync/sync.gyp b/sync/sync.gyp
index c91534db4624eb1019045d378dd18f1b7e5b1c5d..57d0f2ebd16ca590d12ff606e93b6c3b40e8c66f 100644
--- a/sync/sync.gyp
+++ b/sync/sync.gyp
@@ -8,15 +8,8 @@
},
'targets': [
# The core sync library.
- #
- # TODO(akalin): Rename this to something like 'sync_core' and
- # reserve the 'sync' name for the overarching library that clients
- # should depend on.
{
- 'target_name': 'sync',
- # TODO(akalin): Change this to '<(component)'. When we rename
- # this to 'sync_core' and make the overarching 'sync' library,
- # make that one '<(component)'.
+ 'target_name': 'sync_core',
'type': 'static_library',
'variables': { 'enable_wexit_time_destructors': 1, },
'include_dirs': [
@@ -41,43 +34,6 @@
],
'sources': [
'base/sync_export.h',
- 'internal_api/public/base/enum_set.h',
- 'internal_api/public/base/invalidation.cc',
- 'internal_api/public/base/invalidation.h',
- 'internal_api/public/base/model_type.h',
- 'internal_api/public/base/model_type_invalidation_map.cc',
- 'internal_api/public/base/model_type_invalidation_map.h',
- 'internal_api/public/base/node_ordinal.cc',
- 'internal_api/public/base/node_ordinal.h',
- 'internal_api/public/base/ordinal.h',
- 'internal_api/public/base/progress_marker_map.cc',
- 'internal_api/public/base/progress_marker_map.h',
- 'internal_api/public/engine/model_safe_worker.cc',
- 'internal_api/public/engine/model_safe_worker.h',
- 'internal_api/public/engine/passive_model_worker.cc',
- 'internal_api/public/engine/passive_model_worker.h',
- 'internal_api/public/engine/polling_constants.cc',
- 'internal_api/public/engine/polling_constants.h',
- 'internal_api/public/engine/sync_status.cc',
- 'internal_api/public/engine/sync_status.h',
- 'internal_api/public/sessions/model_neutral_state.cc',
- 'internal_api/public/sessions/model_neutral_state.h',
- 'internal_api/public/sessions/sync_session_snapshot.cc',
- 'internal_api/public/sessions/sync_session_snapshot.h',
- 'internal_api/public/sessions/sync_source_info.cc',
- 'internal_api/public/sessions/sync_source_info.h',
- 'internal_api/public/util/experiments.h',
- 'internal_api/public/util/immutable.h',
- 'internal_api/public/util/syncer_error.cc',
- 'internal_api/public/util/syncer_error.h',
- 'internal_api/public/util/sync_string_conversions.cc',
- 'internal_api/public/util/sync_string_conversions.h',
- 'internal_api/public/util/report_unrecoverable_error_function.h',
- 'internal_api/public/util/unrecoverable_error_handler.h',
- 'internal_api/public/util/unrecoverable_error_info.h',
- 'internal_api/public/util/unrecoverable_error_info.cc',
- 'internal_api/public/util/weak_handle.cc',
- 'internal_api/public/util/weak_handle.h',
'engine/all_status.cc',
'engine/all_status.h',
'engine/apply_control_data_updates.cc',
@@ -252,7 +208,7 @@
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
# TODO(akalin): Remove this (http://crbug.com/133352).
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
- 'sync',
+ 'sync_core',
],
'export_dependent_settings': [
'../jingle/jingle.gyp:notifier',
@@ -302,7 +258,7 @@
},
# The sync internal API library.
{
- 'target_name': 'syncapi_core',
+ 'target_name': 'sync_internal_api',
'type': 'static_library',
'variables': { 'enable_wexit_time_destructors': 1, },
'include_dirs': [
@@ -313,61 +269,98 @@
'../build/temp_gyp/googleurl.gyp:googleurl',
'../net/net.gyp:net',
'protocol/sync_proto.gyp:sync_proto',
+ 'sync_core',
'sync_notifier',
- 'sync',
],
'export_dependent_settings': [
# Propagate sync_proto since our headers include its generated
# files.
'protocol/sync_proto.gyp:sync_proto',
- 'sync',
+ 'sync_core',
],
'sources': [
+ 'internal_api/base_node.cc',
+ 'internal_api/base_transaction.cc',
+ 'internal_api/change_record.cc',
+ 'internal_api/change_reorder_buffer.cc',
+ 'internal_api/change_reorder_buffer.h',
+ 'internal_api/debug_info_event_listener.cc',
+ 'internal_api/debug_info_event_listener.h',
+ 'internal_api/http_bridge.cc',
+ 'internal_api/internal_components_factory_impl.cc',
+ 'internal_api/js_mutation_event_observer.cc',
+ 'internal_api/js_mutation_event_observer.h',
+ 'internal_api/js_sync_encryption_handler_observer.cc',
+ 'internal_api/js_sync_encryption_handler_observer.h',
+ 'internal_api/js_sync_manager_observer.cc',
+ 'internal_api/js_sync_manager_observer.h',
'internal_api/public/base_node.h',
'internal_api/public/base_transaction.h',
+ 'internal_api/public/base/enum_set.h',
+ 'internal_api/public/base/invalidation.cc',
+ 'internal_api/public/base/invalidation.h',
+ 'internal_api/public/base/model_type_invalidation_map.cc',
+ 'internal_api/public/base/model_type_invalidation_map.h',
+ 'internal_api/public/base/model_type.h',
+ 'internal_api/public/base/node_ordinal.cc',
+ 'internal_api/public/base/node_ordinal.h',
+ 'internal_api/public/base/ordinal.h',
+ 'internal_api/public/base/progress_marker_map.cc',
+ 'internal_api/public/base/progress_marker_map.h',
'internal_api/public/change_record.h',
'internal_api/public/configure_reason.h',
+ 'internal_api/public/engine/model_safe_worker.cc',
+ 'internal_api/public/engine/model_safe_worker.h',
+ 'internal_api/public/engine/passive_model_worker.cc',
+ 'internal_api/public/engine/passive_model_worker.h',
+ 'internal_api/public/engine/polling_constants.cc',
+ 'internal_api/public/engine/polling_constants.h',
+ 'internal_api/public/engine/sync_status.cc',
+ 'internal_api/public/engine/sync_status.h',
'internal_api/public/http_bridge.h',
'internal_api/public/http_post_provider_factory.h',
'internal_api/public/http_post_provider_interface.h',
- 'internal_api/public/internal_components_factory.h',
'internal_api/public/internal_components_factory_impl.h',
+ 'internal_api/public/internal_components_factory.h',
'internal_api/public/read_node.h',
'internal_api/public/read_transaction.h',
- 'internal_api/public/sync_manager.h',
+ 'internal_api/public/sessions/model_neutral_state.cc',
+ 'internal_api/public/sessions/model_neutral_state.h',
+ 'internal_api/public/sessions/sync_session_snapshot.cc',
+ 'internal_api/public/sessions/sync_session_snapshot.h',
+ 'internal_api/public/sessions/sync_source_info.cc',
+ 'internal_api/public/sessions/sync_source_info.h',
'internal_api/public/sync_encryption_handler.cc',
'internal_api/public/sync_encryption_handler.h',
- 'internal_api/public/sync_manager.cc',
'internal_api/public/sync_manager_factory.h',
+ 'internal_api/public/sync_manager.cc',
+ 'internal_api/public/sync_manager.h',
'internal_api/public/user_share.h',
+ 'internal_api/public/util/experiments.h',
+ 'internal_api/public/util/immutable.h',
+ 'internal_api/public/util/report_unrecoverable_error_function.h',
+ 'internal_api/public/util/sync_string_conversions.cc',
+ 'internal_api/public/util/sync_string_conversions.h',
+ 'internal_api/public/util/syncer_error.cc',
+ 'internal_api/public/util/syncer_error.h',
+ 'internal_api/public/util/unrecoverable_error_handler.h',
+ 'internal_api/public/util/unrecoverable_error_info.cc',
+ 'internal_api/public/util/unrecoverable_error_info.h',
+ 'internal_api/public/util/weak_handle.cc',
+ 'internal_api/public/util/weak_handle.h',
'internal_api/public/write_node.h',
'internal_api/public/write_transaction.h',
- 'internal_api/base_node.cc',
- 'internal_api/base_transaction.cc',
- 'internal_api/change_record.cc',
- 'internal_api/change_reorder_buffer.cc',
- 'internal_api/change_reorder_buffer.h',
- 'internal_api/debug_info_event_listener.cc',
- 'internal_api/debug_info_event_listener.h',
- 'internal_api/http_bridge.cc',
- 'internal_api/internal_components_factory_impl.cc',
- 'internal_api/js_mutation_event_observer.cc',
- 'internal_api/js_mutation_event_observer.h',
- 'internal_api/js_sync_encryption_handler_observer.cc',
- 'internal_api/js_sync_encryption_handler_observer.h',
- 'internal_api/js_sync_manager_observer.cc',
- 'internal_api/js_sync_manager_observer.h',
'internal_api/read_node.cc',
'internal_api/read_transaction.cc',
- 'internal_api/syncapi_internal.cc',
- 'internal_api/syncapi_internal.h',
- 'internal_api/syncapi_server_connection_manager.cc',
- 'internal_api/syncapi_server_connection_manager.h',
'internal_api/sync_encryption_handler_impl.cc',
'internal_api/sync_encryption_handler_impl.h',
'internal_api/sync_manager_factory.cc',
'internal_api/sync_manager_impl.cc',
'internal_api/sync_manager_impl.h',
+ 'internal_api/syncapi_internal.cc',
+ 'internal_api/syncapi_internal.h',
+ 'internal_api/syncapi_server_connection_manager.cc',
+ 'internal_api/syncapi_server_connection_manager.h',
'internal_api/user_share.cc',
'internal_api/write_node.cc',
'internal_api/write_transaction.cc',
@@ -376,7 +369,7 @@
# The sync external API library.
{
- 'target_name': 'syncapi_service',
+ 'target_name': 'sync_api',
'type': 'static_library',
'variables': { 'enable_wexit_time_destructors': 1, },
'include_dirs': [
@@ -385,7 +378,7 @@
'dependencies': [
'../base/base.gyp:base',
'protocol/sync_proto.gyp:sync_proto',
- 'sync',
+ 'sync_internal_api',
],
# We avoid including header files from sync_proto in our public
# header files so we don't need to export its settings.
@@ -407,9 +400,46 @@
],
},
- # Test support files for the 'sync' target.
+ # The componentized sync library.
+ {
+ 'target_name': 'sync_component',
+ # TODO(rsimha): Change the type of this target to '<(component)' after
+ # exporting dependencies on 'sync_proto'.
+ 'type': 'none',
+ 'variables': { 'enable_wexit_time_destructors': 1, },
akalin 2012/11/10 00:29:11 i wonder if this variables decl is actually needed
Raghu Simha 2012/11/12 18:49:48 Removed.
+ 'dependencies': [
+ 'sync_api',
+ 'sync_core',
+ 'sync_notifier',
+ 'sync_internal_api',
+ ],
+ 'export_dependent_settings': [
+ 'sync_api',
+ 'sync_core',
+ 'sync_notifier',
+ 'sync_internal_api',
+ ],
+ },
+
+ # The public sync target. This depends on 'sync_component' and
+ # 'sync_proto' separately since 'sync_proto' isn't exportable from
+ # 'sync_component' (for now).
+ {
+ 'target_name': 'sync',
+ 'type': 'none',
akalin 2012/11/10 00:29:11 same comment as above re. suppress_wildcard: 1
Raghu Simha 2012/11/12 18:49:48 I seem to be able to build 'all' without suppress_
+ 'dependencies': [
+ 'sync_component',
+ 'protocol/sync_proto.gyp:sync_proto',
+ ],
+ 'export_dependent_settings': [
+ 'sync_component',
+ 'protocol/sync_proto.gyp:sync_proto',
+ ],
+ },
+
+ # Test support files for the 'sync_core' target.
{
- 'target_name': 'test_support_sync',
+ 'target_name': 'test_support_sync_core',
'type': 'static_library',
'variables': { 'enable_wexit_time_destructors': 1, },
'include_dirs': [
@@ -420,23 +450,15 @@
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'protocol/sync_proto.gyp:sync_proto',
- 'sync',
+ 'sync_core',
],
'export_dependent_settings': [
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'protocol/sync_proto.gyp:sync_proto',
- 'sync',
+ 'sync_core',
],
'sources': [
- 'internal_api/public/base/invalidation_test_util.cc',
- 'internal_api/public/base/invalidation_test_util.h',
- 'internal_api/public/base/model_type_invalidation_map_test_util.cc',
- 'internal_api/public/base/model_type_invalidation_map_test_util.h',
- 'internal_api/public/base/model_type_test_util.cc',
- 'internal_api/public/base/model_type_test_util.h',
- 'internal_api/public/sessions/sync_source_info_unittest.cc',
- 'internal_api/public/sessions/sync_session_snapshot_unittest.cc',
'js/js_test_util.cc',
'js/js_test_util.h',
'sessions/test_util.cc',
@@ -485,11 +507,13 @@
'dependencies': [
'../testing/gmock.gyp:gmock',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
+ 'sync_internal_api',
akalin 2012/11/10 00:29:11 nice catch
'sync_notifier',
],
'export_dependent_settings': [
'../testing/gmock.gyp:gmock',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
+ 'sync_internal_api',
'sync_notifier',
],
'sources': [
@@ -506,9 +530,9 @@
],
},
- # Test support files for the 'syncapi_core' target.
+ # Test support files for the 'sync_internal_api' target.
{
- 'target_name': 'test_support_syncapi_core',
+ 'target_name': 'test_support_sync_internal_api',
'type': 'static_library',
'variables': { 'enable_wexit_time_destructors': 1, },
'include_dirs': [
@@ -517,17 +541,23 @@
'dependencies': [
'../base/base.gyp:base',
'../testing/gtest.gyp:gtest',
- 'syncapi_core',
+ 'sync_core',
'sync_notifier',
- 'test_support_sync',
],
'export_dependent_settings': [
'../testing/gtest.gyp:gtest',
- 'syncapi_core',
+ 'sync_core',
akalin 2012/11/10 00:29:11 need dependency on sync_internal_api also (from in
Raghu Simha 2012/11/12 18:49:48 Done.
'sync_notifier',
- 'test_support_sync',
akalin 2012/11/10 00:29:11 looks like this dep is still needed -- test_intern
Raghu Simha 2012/11/12 18:49:48 Done.
],
'sources': [
+ 'internal_api/public/base/invalidation_test_util.cc',
+ 'internal_api/public/base/invalidation_test_util.h',
+ 'internal_api/public/base/model_type_invalidation_map_test_util.cc',
+ 'internal_api/public/base/model_type_invalidation_map_test_util.h',
+ 'internal_api/public/base/model_type_test_util.cc',
+ 'internal_api/public/base/model_type_test_util.h',
+ 'internal_api/public/sessions/sync_source_info_unittest.cc',
akalin 2012/11/10 00:29:11 hunh, these are actual unittest files -- i think t
Raghu Simha 2012/11/12 18:49:48 Done. Moved to sync_internal_api_tests.
+ 'internal_api/public/sessions/sync_session_snapshot_unittest.cc',
'internal_api/public/test/fake_sync_manager.h',
'internal_api/public/test/test_entry_factory.h',
akalin 2012/11/10 00:29:11 looks like this pulls in a dep on the proto target
Raghu Simha 2012/11/12 18:49:48 Done.
'internal_api/public/test/test_internal_components_factory.h',
@@ -539,20 +569,20 @@
],
},
- # Test support files for the 'syncapi_service' target.
+ # Test support files for the 'sync_api' target.
{
- 'target_name': 'test_support_syncapi_service',
+ 'target_name': 'test_support_sync_api',
'type': 'static_library',
'include_dirs': [
'..',
],
'dependencies': [
'../testing/gmock.gyp:gmock',
- 'syncapi_service',
+ 'sync_api',
],
'export_dependent_settings': [
'../testing/gmock.gyp:gmock',
- 'syncapi_service',
+ 'sync_api',
],
'sources': [
'api/fake_syncable_service.cc',
@@ -562,12 +592,12 @@
],
},
- # Unit tests for the 'sync' target. This cannot be a static
+ # Unit tests for the 'sync_core' target. This cannot be a static
# library because the unit test files have to be compiled directly
# into the executable, so we push the target files to the
# depending executable target via direct_dependent_settings.
{
- 'target_name': 'sync_tests',
+ 'target_name': 'sync_core_tests',
'type': 'none',
# We only want unit test executables to include this target.
'suppress_wildcard': 1,
@@ -576,8 +606,8 @@
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'protocol/sync_proto.gyp:sync_proto',
- 'sync',
- 'test_support_sync',
+ 'sync_core',
+ 'test_support_sync_core',
],
# Propagate all dependencies since the actual compilation
# happens in the dependents.
@@ -586,8 +616,8 @@
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'protocol/sync_proto.gyp:sync_proto',
- 'sync',
- 'test_support_sync',
+ 'sync_core',
+ 'test_support_sync_core',
],
'direct_dependent_settings': {
'include_dirs': [
@@ -665,7 +695,7 @@
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
- 'sync',
+ 'sync_core',
'sync_notifier',
'test_support_sync_notifier',
],
@@ -678,7 +708,7 @@
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
- 'sync',
+ 'sync_core',
'sync_notifier',
'test_support_sync_notifier',
],
@@ -717,12 +747,12 @@
],
},
- # Unit tests for the 'syncapi_core' target. This cannot be a static
+ # Unit tests for the 'sync_internal_api' target. This cannot be a static
# library because the unit test files have to be compiled directly
# into the executable, so we push the target files to the
# depending executable target via direct_dependent_settings.
{
- 'target_name': 'syncapi_core_tests',
+ 'target_name': 'sync_internal_api_tests',
'type': 'none',
# We only want unit test executables to include this target.
'suppress_wildcard': 1,
@@ -733,10 +763,10 @@
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'protocol/sync_proto.gyp:sync_proto',
- 'sync',
+ 'sync_core',
+ 'sync_internal_api',
'sync_notifier',
- 'syncapi_core',
- 'test_support_syncapi_core',
+ 'test_support_sync_internal_api',
],
# Propagate all dependencies since the actual compilation
# happens in the dependents.
@@ -747,10 +777,10 @@
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'protocol/sync_proto.gyp:sync_proto',
- 'sync',
+ 'sync_core',
+ 'sync_internal_api',
'sync_notifier',
- 'syncapi_core',
- 'test_support_syncapi_core',
+ 'test_support_sync_internal_api',
],
'direct_dependent_settings': {
'include_dirs': [
@@ -770,12 +800,12 @@
},
},
- # Unit tests for the 'syncapi_service' target. This cannot be a static
+ # Unit tests for the 'sync_api' target. This cannot be a static
# library because the unit test files have to be compiled directly
# into the executable, so we push the target files to the
# depending executable target via direct_dependent_settings.
{
- 'target_name': 'syncapi_service_tests',
+ 'target_name': 'sync_api_tests',
'type': 'none',
# We only want unit test executables to include this target.
'suppress_wildcard': 1,
@@ -783,9 +813,9 @@
'../base/base.gyp:base',
'../testing/gtest.gyp:gtest',
'protocol/sync_proto.gyp:sync_proto',
- 'sync',
- 'syncapi_service',
- 'test_support_syncapi_service',
+ 'sync_core',
+ 'sync_internal_api',
+ 'test_support_sync_internal_api',
],
# Propagate all dependencies since the actual compilation
# happens in the dependents.
@@ -793,9 +823,9 @@
'../base/base.gyp:base',
'../testing/gtest.gyp:gtest',
'protocol/sync_proto.gyp:sync_proto',
- 'sync',
- 'syncapi_service',
- 'test_support_syncapi_service',
+ 'sync_core',
+ 'sync_internal_api',
+ 'test_support_sync_internal_api',
],
'direct_dependent_settings': {
'include_dirs': [
@@ -816,10 +846,11 @@
'variables': { 'enable_wexit_time_destructors': 0, },
'dependencies': [
'../base/base.gyp:run_all_unittests',
- 'sync_tests',
+ 'sync',
+ 'sync_api_tests',
+ 'sync_core_tests',
'sync_notifier_tests',
- 'syncapi_core_tests',
- 'syncapi_service_tests',
+ 'sync_internal_api_tests',
],
# TODO(akalin): This is needed because histogram.cc uses
# leak_annotations.h, which pulls this in. Make 'base'
@@ -879,7 +910,7 @@
'../net/net.gyp:net_test_support',
'sync',
'sync_notifier',
- 'syncapi_core',
+ 'sync_internal_api',
akalin 2012/11/10 00:29:11 alphabetize
Raghu Simha 2012/11/12 18:49:48 Done.
],
'sources': [
'tools/sync_client.cc',
@@ -887,6 +918,7 @@
},
],
}],
+
# Special target to wrap a gtest_target_type==shared_library
# sync_unit_tests into an android apk for execution.
['OS == "android" and gtest_target_type == "shared_library"', {
« no previous file with comments | « net/net.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698