summaryrefslogtreecommitdiffstats
path: root/third_party/protobuf/README.chromium
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-07 22:27:57 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-07 22:27:57 +0000
commitbaefae90f294a981c973bffbdd3eccabfe796b6a (patch)
treed55ee1e86fe8db74ed7bbebfd844bdd803f343b4 /third_party/protobuf/README.chromium
parent5a246999dda2dd518d88f160294a071b4dd6486b (diff)
downloadchromium_src-baefae90f294a981c973bffbdd3eccabfe796b6a.zip
chromium_src-baefae90f294a981c973bffbdd3eccabfe796b6a.tar.gz
chromium_src-baefae90f294a981c973bffbdd3eccabfe796b6a.tar.bz2
Linux: change protobuf default option to allow building
with unpatched system protobuf. This is a preparation for landing https://codereview.chromium.org/11231046/ and a solution chosen because our custom protobuf changes will not be accepted upstream. Setting defaults to optimize for lite runtime and retain unknown fields makes it possible to use the same .proto files with system protobuf. BUG=157155 TEST=none Review URL: https://codereview.chromium.org/11228038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166534 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/protobuf/README.chromium')
-rw-r--r--third_party/protobuf/README.chromium4
1 files changed, 3 insertions, 1 deletions
diff --git a/third_party/protobuf/README.chromium b/third_party/protobuf/README.chromium
index 3b861c8..45ffa2c 100644
--- a/third_party/protobuf/README.chromium
+++ b/third_party/protobuf/README.chromium
@@ -15,7 +15,9 @@ descriptor2_pb.py
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.
+See r62331 for the patch. Defaults have been changed to allow building
+with unpatched system protobuf: default for optimize_for option is now
+LITE_RUNTIME, and default for retain_unknown_fields is true.
Revision r427 was cherry-picked from upstream.