Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Unified Diff: third_party/protobuf/src/google/protobuf/descriptor.proto

Issue 11228038: Linux: change protobuf default option to allow building (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/protobuf/README.chromium ('k') | third_party/protobuf/src/google/protobuf/descriptor.pb.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/protobuf/src/google/protobuf/descriptor.proto
diff --git a/third_party/protobuf/src/google/protobuf/descriptor.proto b/third_party/protobuf/src/google/protobuf/descriptor.proto
index bd3cb96efaa589b05d5d881a8c2ee3bc8e2573e2..1f956befbc8dab986b08edda9ba31f2009de500d 100644
--- a/third_party/protobuf/src/google/protobuf/descriptor.proto
+++ b/third_party/protobuf/src/google/protobuf/descriptor.proto
@@ -260,7 +260,7 @@ message FileOptions {
// reserializing a message will retain them. This is the default behaviour
// unless LITE_RUNTIME is specified. Therefore, this option only makes sense
// when LITE_RUNTIME is in use.
- optional bool retain_unknown_fields = 11 [default=false];
+ optional bool retain_unknown_fields = 11 [default=true];
// If set true, then the Java code generator will generate equals() and
// hashCode() methods for all messages defined in the .proto file. This is
@@ -275,7 +275,7 @@ message FileOptions {
CODE_SIZE = 2; // Use ReflectionOps to implement these methods.
LITE_RUNTIME = 3; // Generate code using MessageLite and the lite runtime.
}
- optional OptimizeMode optimize_for = 9 [default=SPEED];
+ optional OptimizeMode optimize_for = 9 [default=LITE_RUNTIME];
« no previous file with comments | « third_party/protobuf/README.chromium ('k') | third_party/protobuf/src/google/protobuf/descriptor.pb.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698