Chromium Code Reviews
[email protected] (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(536)

Issue 11638018: [sync] Componentize sync: Part 5: Eliminate filename collisions in sync.gyp (Closed)

Created:
8 years ago by Raghu Simha
Modified:
8 years ago
CC:
chromium-reviews, haitaol1, akalin
Visibility:
Public.

Description

[sync] Componentize sync: Part 5: Eliminate filename collisions in sync.gyp In order to move src/sync into its own compoent, all the static_library targets in sync.gyp need to be converted to targets of type 'none' and rolled into one sync target of type component. This is currently blocked by duplicate .cc filenames in syncable and internal_api, which flags an error while running gyp. The offending files are {internal_api|syncable}/{base|read|write}_transaction.cc. This patch renames syncable/{base|read|write}_transaction.{h|cc} to syncable/syncable_{base|read|write}_transaction.{h|cc}. BUG=136928 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=174032

Patch Set 1 #

Total comments: 2

Patch Set 2 : Remove comments #

Unified diffs Side-by-side diffs Delta from patch set Stats (+121 lines, -578 lines) Patch
M chrome/browser/sync/glue/bookmark_change_processor.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M chrome/browser/sync/glue/bookmark_model_associator.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M chrome/browser/sync/glue/session_model_associator.cc View 2 chunks +3 lines, -3 lines 0 comments Download
M chrome/browser/sync/profile_sync_service_autofill_unittest.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M sync/engine/apply_control_data_updates.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M sync/engine/apply_control_data_updates_unittest.cc View 2 chunks +3 lines, -3 lines 0 comments Download
M sync/engine/apply_updates_and_resolve_conflicts_command.cc View 2 chunks +3 lines, -3 lines 0 comments Download
M sync/engine/apply_updates_and_resolve_conflicts_command_unittest.cc View 2 chunks +3 lines, -3 lines 0 comments Download
M sync/engine/build_commit_command.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M sync/engine/commit.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M sync/engine/conflict_resolver.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M sync/engine/download_updates_command.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M sync/engine/get_commit_ids_command.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M sync/engine/process_commit_response_command.cc View 2 chunks +3 lines, -3 lines 0 comments Download
M sync/engine/process_commit_response_command_unittest.cc View 2 chunks +3 lines, -3 lines 0 comments Download
M sync/engine/process_updates_command.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M sync/engine/syncer_unittest.cc View 2 chunks +3 lines, -3 lines 0 comments Download
M sync/engine/syncer_util.cc View 2 chunks +3 lines, -3 lines 0 comments Download
M sync/engine/update_applicator.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M sync/internal_api/change_reorder_buffer.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M sync/internal_api/read_node.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M sync/internal_api/read_transaction.cc View 1 chunk +2 lines, -2 lines 0 comments Download
M sync/internal_api/sync_encryption_handler_impl.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M sync/internal_api/sync_encryption_handler_impl_unittest.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M sync/internal_api/sync_manager_impl_unittest.cc View 2 chunks +3 lines, -3 lines 0 comments Download
M sync/internal_api/test/test_entry_factory.cc View 2 chunks +3 lines, -3 lines 0 comments Download
M sync/internal_api/test/test_user_share.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M sync/internal_api/write_transaction.cc View 1 chunk +2 lines, -2 lines 0 comments Download
M sync/sessions/sync_session_unittest.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M sync/sync.gyp View 1 4 chunks +7 lines, -7 lines 0 comments Download
D sync/syncable/base_transaction.h View 1 chunk +0 lines, -82 lines 0 comments Download
D sync/syncable/base_transaction.cc View 1 chunk +0 lines, -70 lines 0 comments Download
M sync/syncable/directory.cc View 2 chunks +4 lines, -4 lines 0 comments Download
M sync/syncable/entry.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M sync/syncable/mutable_entry.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M sync/syncable/nigori_util.cc View 2 chunks +2 lines, -2 lines 0 comments Download
D sync/syncable/read_transaction.h View 1 chunk +0 lines, -32 lines 0 comments Download
D sync/syncable/read_transaction.cc View 1 chunk +0 lines, -22 lines 0 comments Download
A + sync/syncable/syncable_base_transaction.h View 2 chunks +4 lines, -4 lines 0 comments Download
A + sync/syncable/syncable_base_transaction.cc View 1 chunk +2 lines, -2 lines 0 comments Download
M sync/syncable/syncable_mock.h View 2 chunks +2 lines, -2 lines 0 comments Download
A + sync/syncable/syncable_read_transaction.h View 2 chunks +5 lines, -5 lines 0 comments Download
A + sync/syncable/syncable_read_transaction.cc View 1 chunk +2 lines, -2 lines 0 comments Download
M sync/syncable/syncable_unittest.cc View 2 chunks +3 lines, -3 lines 0 comments Download
M sync/syncable/syncable_util.cc View 2 chunks +2 lines, -2 lines 0 comments Download
A + sync/syncable/syncable_write_transaction.h View 2 chunks +4 lines, -4 lines 0 comments Download
A + sync/syncable/syncable_write_transaction.cc View 1 chunk +2 lines, -2 lines 0 comments Download
D sync/syncable/write_transaction.h View 1 chunk +0 lines, -68 lines 0 comments Download
D sync/syncable/write_transaction.cc View 1 chunk +0 lines, -183 lines 0 comments Download
M sync/syncable/write_transaction_info.h View 1 chunk +2 lines, -2 lines 0 comments Download
M sync/test/engine/mock_connection_manager.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M sync/test/engine/test_directory_setter_upper.cc View 2 chunks +3 lines, -3 lines 0 comments Download
M sync/test/engine/test_syncable_utils.cc View 2 chunks +3 lines, -3 lines 0 comments Download

Messages

Total messages: 5 (0 generated)
Raghu Simha
Richard, please review. Thanks.
8 years ago (2012-12-19 20:14:35 UTC) #1
rlarocque
LGTM, though we should ping Tim about this before we commit. He has a better ...
8 years ago (2012-12-19 22:04:49 UTC) #2
Raghu Simha
Tim, please review. See https://groups.google.com/a/chromium.org/forum/?fromgroups=#!topic/chromium-dev/cADIe95MBJM for more context. Thanks. https://codereview.chromium.org/11638018/diff/1/sync/sync.gyp File sync/sync.gyp (right): https://codereview.chromium.org/11638018/diff/1/sync/sync.gyp#newcode180 sync/sync.gyp:180: ...
8 years ago (2012-12-19 22:10:36 UTC) #3
tim (not reviewing)
On 2012/12/19 22:04:49, rlarocque wrote: > LGTM, though we should ping Tim about this before ...
8 years ago (2012-12-19 22:24:18 UTC) #4
Raghu Simha
8 years ago (2012-12-19 22:41:28 UTC) #5
On 2012/12/19 22:24:18, timsteele wrote:
> I'm not a gyp expert, but you're sure this is necessary?  

Yes, it's going to be necessary for component builds, where all targets have
type 'none', and get consumed by the sync component target. Ninja barfs when
there are two translation units in a target with the same name.

> So, if we need this, I don't have any improvement to offer and I think this
> LGTM.

I considered renaming one of the classes and discussed it with Richard, but it
seemed to be a lot of work for no real benefit except sticking to the naming
convention. I'll land this patch as is. Thanks.

Powered by Google App Engine
This is Rietveld 408576698