diff options
author | maniscalco@chromium.org <maniscalco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-19 00:39:36 +0000 |
---|---|---|
committer | maniscalco@chromium.org <maniscalco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-19 00:39:36 +0000 |
commit | 906a99807de6d57c3d120fac720887171b5d9f77 (patch) | |
tree | a77de279b2812c158d98ad18007cfc24c6914a3e /sync | |
parent | 6d2d9602360ba40d60fb6857383971ef0ae0f9bc (diff) | |
download | chromium_src-906a99807de6d57c3d120fac720887171b5d9f77.zip chromium_src-906a99807de6d57c3d120fac720887171b5d9f77.tar.gz chromium_src-906a99807de6d57c3d120fac720887171b5d9f77.tar.bz2 |
Revert of Include sync.pb.h in sync_data.h. (https://chromiumcodereview.appspot.com/182313002/)
Reason for revert:
Broke win_x86_rel trybots about two thirds of the time (can't find sync.pb.h). Appears that the build is non-deterministic, gonna need more testing.
Original issue's description:
> Include sync.pb.h in sync_data.h.
>
> This change has two parts, including sync.pb.h in sync_data.h, and fixing
> gyp dependencies and header includes so that everything still builds.
>
> Include sync.pb.h in sync_data.h in preparation for using AttachmentId
> (a protobuf in sync.pb.h) in sync_data.h. A forward declaration is
> insufficient because sync_data.h will be getting a typedef for vector<>
> of AttachmentId.
>
> Several targets (transitively) depend on sync, however, their dependence
> is not properly modeled in gyp. Update dependencies and header includes
> so they can "see" sync.pb.h (a generated header) and any headers it
> includes.
>
> Without these changes, four targets fail to build:
>
> 1. extensions_browser - See extensions/extensions.gyp for the fix. Here's
> the compiler error:
>
> In file included from ../../extensions/browser/extension_function.cc:10:
> In file included from ../../chrome/browser/extensions/extension_service.h:23:
> In file included from ../../chrome/browser/extensions/extension_sync_service.h:12:
> In file included from ../../chrome/browser/extensions/app_sync_bundle.h:15:
> In file included from ../../chrome/browser/extensions/app_sync_data.h:8:
> In file included from ../../chrome/browser/extensions/extension_sync_data.h:11:
> In file included from ../../sync/api/sync_change.h:13:
> ../../sync/api/sync_data.h:17:10: fatal error: 'sync/protocol/sync.pb.h' file not found
>
>
> 2. debugger - See chrome/chrome.gyp for the fix. Here's the compiler
> error:
>
> In file included from ../../chrome/browser/devtools/browser_list_tabcontents_provider.cc:10:
> In file included from ../../chrome/browser/history/top_sites.h:13:
> In file included from ../../chrome/browser/history/history_service.h:26:
> In file included from ../../chrome/browser/history/delete_directive_handler.h:12:
> In file included from ../../sync/api/sync_change_processor.h:10:
> ../../sync/api/sync_data.h:17:10: fatal error: 'sync/protocol/sync.pb.h' file not found
>
>
> 3. apps - See chrome/chrome_browser_extensions.gypi for the fix. Here's
> the compiler error:
>
> In file included from ../../apps/app_load_service.cc:12:
> In file included from ../../chrome/browser/extensions/extension_service.h:23:
> In file included from ../../chrome/browser/extensions/extension_sync_service.h:12:
> In file included from ../../chrome/browser/extensions/app_sync_bundle.h:15:
> In file included from ../../chrome/browser/extensions/app_sync_data.h:8:
> In file included from ../../chrome/browser/extensions/extension_sync_data.h:11:
> In file included from ../../sync/api/sync_change.h:13:
> ../../sync/api/sync_data.h:17:10: fatal error: 'sync/protocol/sync.pb.h' file not found
>
>
> 4. performance_ui_tests - See chrome/chrome_tests.gypi for the fix.
> Here's the compiler error:
>
> In file included from ../../chrome/test/perf/generate_profile.cc:19:
> In file included from ../../chrome/browser/history/history_service.h:26:
> In file included from ../../chrome/browser/history/delete_directive_handler.h:12:
> In file included from ../../sync/api/sync_change_processor.h:10:
> In file included from ../../sync/api/sync_data.h:17:
> gen/protoc_out/sync/protocol/sync.pb.h:9:10: fatal error: 'google/protobuf/stubs/common.h' file not found
>
> BUG=
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=257666
TBR=tim@chromium.org,asargent@chromium.org,thakis@chromium.org,rsleevi@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=
Review URL: https://codereview.chromium.org/196423023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257833 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync')
-rw-r--r-- | sync/api/sync_data.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sync/api/sync_data.h b/sync/api/sync_data.h index 92b7c178..43f64f9 100644 --- a/sync/api/sync_data.h +++ b/sync/api/sync_data.h @@ -14,7 +14,6 @@ #include "sync/base/sync_export.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/util/immutable.h" -#include "sync/protocol/sync.pb.h" namespace sync_pb { class EntitySpecifics; |