diff options
| author | nyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-12 21:36:20 +0000 |
|---|---|---|
| committer | nyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-12 21:36:20 +0000 |
| commit | 93115b583d5fa6235abe81820b0df26861196542 (patch) | |
| tree | dc0be0c23cb8edfeeb81f2347cefceb4c4fe6ffa /third_party/protobuf/README.chromium | |
| parent | 1ba5dd614a3648feb6c23fa794dc7654a759b2b4 (diff) | |
| download | chromium_src-93115b583d5fa6235abe81820b0df26861196542.zip chromium_src-93115b583d5fa6235abe81820b0df26861196542.tar.gz chromium_src-93115b583d5fa6235abe81820b0df26861196542.tar.bz2 | |
Revert "Linux: change protobuf default option to allow building"
This reverts commit baefae90f294a981c973bffbdd3eccabfe796b6a.
The change broke Chrome for Android because non-vanilla protobuf-lite
Java files were generated.
Original review:
https://codereview.chromium.org/11228038/
TBR=phajdan.jr
BUG=160256
Review URL: https://codereview.chromium.org/11359146
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167242 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/protobuf/README.chromium')
| -rw-r--r-- | third_party/protobuf/README.chromium | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/third_party/protobuf/README.chromium b/third_party/protobuf/README.chromium index 45ffa2c..3b861c8 100644 --- a/third_party/protobuf/README.chromium +++ b/third_party/protobuf/README.chromium @@ -15,9 +15,7 @@ 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. 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. +See r62331 for the patch. Revision r427 was cherry-picked from upstream. |