summaryrefslogtreecommitdiffstats
path: root/third_party/protobuf/README.chromium
diff options
context:
space:
mode:
authorrsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-14 22:40:44 +0000
committerrsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-14 22:40:44 +0000
commitdb172a2943b5ccd7eb5e77909f28e55c1836a537 (patch)
treea936913939b2684742a0ae16324ff89353952cd3 /third_party/protobuf/README.chromium
parent7af985a498165e9ba74d7e428be4ffe9a054f053 (diff)
downloadchromium_src-db172a2943b5ccd7eb5e77909f28e55c1836a537.zip
chromium_src-db172a2943b5ccd7eb5e77909f28e55c1836a537.tar.gz
chromium_src-db172a2943b5ccd7eb5e77909f28e55c1836a537.tar.bz2
[sync] Componentize sync: Part 4: Fix includes in third_party/protobuf
Various chrome components depend on third_party/protobuf:protobuf_lite, and in order to move to component builds, third_party/protobuf:protobuf_lite must support component builds. As of today, there are a few incorrect includes and a few missing exports in third_party that block this. This patch corrects instances of incorrect includes of headers from third_party/protobuf.gyp:protobuf_full_do_not_use, and replaces them with correct includes from third_party/protobuf.gyp:protobuf_lite BUG=136928 Review URL: https://codereview.chromium.org/11316370 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173228 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/protobuf/README.chromium')
-rw-r--r--third_party/protobuf/README.chromium4
1 files changed, 4 insertions, 0 deletions
diff --git a/third_party/protobuf/README.chromium b/third_party/protobuf/README.chromium
index 2599737..15b4869 100644
--- a/third_party/protobuf/README.chromium
+++ b/third_party/protobuf/README.chromium
@@ -19,6 +19,10 @@ A protobuf.gyp file has been added for building with Chromium.
This code has been patched to support unknown field retention in protobuf-lite.
See r62331 for the patch.
+This code has been patched to ensure that files in the target protobuf_lite
+do not include headers from protobuf_full. See rXXXXXX for the patch.
+TODO(rsimha): Update rXXXXXX above once the patch is committed.
+
Revisions r427 and r430 were cherry-picked from upstream.
Cherry-pick patch from http://code.google.com/p/protobuf/issues/detail?id=425.