summaryrefslogtreecommitdiffstats
path: root/sync
diff options
context:
space:
mode:
authormaniscalco@chromium.org <maniscalco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-18 17:08:36 +0000
committermaniscalco@chromium.org <maniscalco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-18 17:08:36 +0000
commit0229235e3f8734f9cae48748529f68ccbf1d289c (patch)
treed892127fcd0b23243237cb26bde3f37454921ccc /sync
parente9da2b7913d6af558ecfe79e769c3db966f548e8 (diff)
downloadchromium_src-0229235e3f8734f9cae48748529f68ccbf1d289c.zip
chromium_src-0229235e3f8734f9cae48748529f68ccbf1d289c.tar.gz
chromium_src-0229235e3f8734f9cae48748529f68ccbf1d289c.tar.bz2
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= Review URL: https://codereview.chromium.org/182313002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257666 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync')
-rw-r--r--sync/api/sync_data.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sync/api/sync_data.h b/sync/api/sync_data.h
index 43f64f9..92b7c178 100644
--- a/sync/api/sync_data.h
+++ b/sync/api/sync_data.h
@@ -14,6 +14,7 @@
#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;