Index: sync/sync.gyp |
diff --git a/sync/sync.gyp b/sync/sync.gyp |
index 5372b9d8a3da1862bcb428aeb70a3fa5d5a110a7..934d318a6368214f265b051ba8c7b1bc9a60d984 100644 |
--- a/sync/sync.gyp |
+++ b/sync/sync.gyp |
@@ -53,8 +53,16 @@ |
'internal_api/public/syncable/model_type_payload_map.cc', |
'internal_api/public/syncable/model_type_payload_map.h', |
'internal_api/public/util/enum_set.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/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_updates_command.cc', |
@@ -172,7 +180,6 @@ |
'util/data_type_histogram.h', |
'util/encryptor.h', |
- 'util/experiments.h', |
'util/extensions_activity_monitor.cc', |
'util/extensions_activity_monitor.h', |
'util/get_session_name.cc', |
@@ -181,21 +188,14 @@ |
'util/get_session_name_mac.h', |
'util/get_session_name_win.cc', |
'util/get_session_name_win.h', |
- 'util/immutable.h', |
'util/logging.cc', |
'util/logging.h', |
'util/nigori.cc', |
'util/nigori.h', |
- 'util/report_unrecoverable_error_function.h', |
'util/session_utils_android.cc', |
'util/session_utils_android.h', |
'util/time.cc', |
'util/time.h', |
- 'util/unrecoverable_error_handler.h', |
- 'util/unrecoverable_error_info.h', |
- 'util/unrecoverable_error_info.cc', |
- 'util/weak_handle.cc', |
- 'util/weak_handle.h', |
], |
}, |
@@ -274,39 +274,39 @@ |
'sync', |
], |
'sources': [ |
+ 'internal_api/public/base_node.h', |
+ 'internal_api/public/base_transaction.h', |
+ 'internal_api/public/change_record.h', |
+ 'internal_api/public/configure_reason.h', |
+ 'internal_api/public/http_post_provider_factory.h', |
+ 'internal_api/public/http_post_provider_interface.h', |
+ 'internal_api/public/read_node.h', |
+ 'internal_api/public/read_transaction.h', |
+ 'internal_api/public/sync_manager.h', |
+ 'internal_api/public/user_share.h', |
+ 'internal_api/public/write_node.h', |
+ 'internal_api/public/write_transaction.h', |
'internal_api/base_node.cc', |
- 'internal_api/base_node.h', |
'internal_api/base_transaction.cc', |
- 'internal_api/base_transaction.h', |
'internal_api/change_record.cc', |
- 'internal_api/change_record.h', |
'internal_api/change_reorder_buffer.cc', |
'internal_api/change_reorder_buffer.h', |
- 'internal_api/configure_reason.h', |
'internal_api/debug_info_event_listener.cc', |
'internal_api/debug_info_event_listener.h', |
- 'internal_api/http_post_provider_factory.h', |
- 'internal_api/http_post_provider_interface.h', |
'internal_api/js_mutation_event_observer.cc', |
'internal_api/js_mutation_event_observer.h', |
'internal_api/js_sync_manager_observer.cc', |
'internal_api/js_sync_manager_observer.h', |
'internal_api/read_node.cc', |
- 'internal_api/read_node.h', |
'internal_api/read_transaction.cc', |
- 'internal_api/read_transaction.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/sync_manager.cc', |
- 'internal_api/sync_manager.h', |
'internal_api/user_share.cc', |
- 'internal_api/user_share.h', |
'internal_api/write_node.cc', |
- 'internal_api/write_node.h', |
'internal_api/write_transaction.cc', |
- 'internal_api/write_transaction.h', |
], |
}, |
@@ -445,8 +445,8 @@ |
'test_support_sync', |
], |
'sources': [ |
- 'internal_api/test_user_share.cc', |
- 'internal_api/test_user_share.h', |
+ 'internal_api/public/test/test_user_share.h', |
+ 'internal_api/test/test_user_share.cc', |
], |
}, |
@@ -509,6 +509,7 @@ |
'internal_api/public/engine/model_safe_worker_unittest.cc', |
'internal_api/public/syncable/model_type_payload_map_unittest.cc', |
'internal_api/public/util/enum_set_unittest.cc', |
+ 'internal_api/public/util/immutable_unittest.cc', |
'engine/apply_updates_command_unittest.cc', |
'engine/build_commit_command_unittest.cc', |
'engine/cleanup_disabled_types_command_unittest.cc', |
@@ -545,10 +546,9 @@ |
'util/data_encryption_win_unittest.cc', |
'util/data_type_histogram_unittest.cc', |
'util/get_session_name_unittest.cc', |
- 'util/immutable_unittest.cc', |
'util/nigori_unittest.cc', |
'util/protobuf_unittest.cc', |
- 'util/weak_handle_unittest.cc', |
+ 'internal_api/public/util/weak_handle_unittest.cc', |
], |
}, |
}, |
@@ -651,7 +651,7 @@ |
'..', |
], |
'sources': [ |
- 'internal_api/change_record_unittest.cc', |
+ 'internal_api/public/change_record_unittest.cc', |
'internal_api/debug_info_event_listener_unittest.cc', |
'internal_api/js_mutation_event_observer_unittest.cc', |
'internal_api/js_sync_manager_observer_unittest.cc', |