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
cbchan · Nov 7, 2012 · baefae9 · baefae9
1 parent 5a24699
commit baefae9
Show file tree

Hide file tree

Showing 66 changed files with 68 additions and 214 deletions.
diff --git a/chrome/browser/chromeos/contacts/contact.proto b/chrome/browser/chromeos/contacts/contact.proto
@@ -6,8 +6,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package contacts;
 
 // A contact, roughly based on the GData Contact kind:

diff --git a/chrome/browser/chromeos/drive/drive.proto b/chrome/browser/chromeos/drive/drive.proto
@@ -6,8 +6,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package drive;
 
 // Represents base::PlatformFileInfo.

diff --git a/chrome/browser/feedback/proto/annotations.proto b/chrome/browser/feedback/proto/annotations.proto
@@ -7,8 +7,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package userfeedback;
 
 import "math.proto";

diff --git a/chrome/browser/feedback/proto/chrome.proto b/chrome/browser/feedback/proto/chrome.proto
@@ -4,8 +4,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package userfeedback;
 
 // Chrome Browser and Chrome OS specific data.

diff --git a/chrome/browser/feedback/proto/common.proto b/chrome/browser/feedback/proto/common.proto
@@ -7,8 +7,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package userfeedback;
 
 // Data present in all kinds of feedbacks, regardless of source (Web, Android,

diff --git a/chrome/browser/feedback/proto/config.proto b/chrome/browser/feedback/proto/config.proto
@@ -7,8 +7,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package userfeedback;
 
 // Product for which feedback can be sent: GMail, Writely etc.

diff --git a/chrome/browser/feedback/proto/dom.proto b/chrome/browser/feedback/proto/dom.proto
@@ -7,8 +7,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package userfeedback;
 
 // Data captured from HTMLDocument DOM object.

diff --git a/chrome/browser/feedback/proto/extension.proto b/chrome/browser/feedback/proto/extension.proto
@@ -6,8 +6,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package userfeedback;
 
 import "common.proto";

diff --git a/chrome/browser/feedback/proto/math.proto b/chrome/browser/feedback/proto/math.proto
@@ -6,8 +6,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package userfeedback;
 
 // 2D Dimensions.

diff --git a/chrome/browser/feedback/proto/web.proto b/chrome/browser/feedback/proto/web.proto
@@ -6,8 +6,6 @@ syntax = "proto2";
 
 package userfeedback;
 
-option optimize_for = LITE_RUNTIME;
-
 // Data present in Web related feedbacks
 
 import "annotations.proto";

diff --git a/chrome/browser/history/in_memory_url_index_cache.proto b/chrome/browser/history/in_memory_url_index_cache.proto
@@ -10,8 +10,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package in_memory_url_index;
 
 message InMemoryURLIndexCacheItem {

diff --git a/chrome/browser/metrics/proto/study.proto b/chrome/browser/metrics/proto/study.proto
@@ -4,8 +4,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package chrome_variations;
 
 // This defines the Protocol Buffer representation of a Chrome Variations study

diff --git a/chrome/browser/metrics/proto/trials_seed.proto b/chrome/browser/metrics/proto/trials_seed.proto
@@ -4,8 +4,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package chrome_variations;
 
 import "study.proto";

diff --git a/chrome/browser/net/cert_logger.proto b/chrome/browser/net/cert_logger.proto
@@ -18,9 +18,6 @@ syntax = "proto2";
 
 package chrome_browser_net;
 
-// Chrome requires this.
-option optimize_for = LITE_RUNTIME;
-
 // Protocol types
 message CertLoggerRequest {
   // The hostname being accessed (required as the cert could be valid for

diff --git a/chrome/browser/policy/proto/chrome_device_policy.proto b/chrome/browser/policy/proto/chrome_device_policy.proto
@@ -4,8 +4,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package enterprise_management;
 
 message DevicePolicyRefreshRateProto {

diff --git a/chrome/browser/policy/proto/device_management_backend.proto b/chrome/browser/policy/proto/device_management_backend.proto
@@ -4,8 +4,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package enterprise_management;
 
 // Request from device to server to register device.

diff --git a/chrome/browser/policy/proto/device_management_local.proto b/chrome/browser/policy/proto/device_management_local.proto
@@ -4,8 +4,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package enterprise_management;
 
 import "device_management_backend.proto";

diff --git a/chrome/browser/policy/proto/old_generic_format.proto b/chrome/browser/policy/proto/old_generic_format.proto
@@ -4,8 +4,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package enterprise_management;
 
 // This file keeps the deprecated GenericNamedValue based format for policies

diff --git a/chrome/browser/safe_browsing/report.proto b/chrome/browser/safe_browsing/report.proto
@@ -16,8 +16,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package safe_browsing;
 
 message ClientMalwareReportRequest {

diff --git a/chrome/browser/sync_file_system/sync_file_system.proto b/chrome/browser/sync_file_system/sync_file_system.proto
@@ -6,8 +6,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package sync_file_system;
 
 message DriveMetadata {

diff --git a/chrome/common/metrics/proto/chrome_experiments.proto b/chrome/common/metrics/proto/chrome_experiments.proto
@@ -6,8 +6,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package metrics;
 
 message ChromeVariations {

diff --git a/chrome/common/metrics/proto/chrome_user_metrics_extension.proto b/chrome/common/metrics/proto/chrome_user_metrics_extension.proto
@@ -6,8 +6,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package metrics;
 
 import "histogram_event.proto";

diff --git a/chrome/common/metrics/proto/histogram_event.proto b/chrome/common/metrics/proto/histogram_event.proto
@@ -6,8 +6,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package metrics;
 
 // Next tag: 4

diff --git a/chrome/common/metrics/proto/omnibox_event.proto b/chrome/common/metrics/proto/omnibox_event.proto
@@ -6,8 +6,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package metrics;
 
 // Next tag: 13

diff --git a/chrome/common/metrics/proto/profiler_event.proto b/chrome/common/metrics/proto/profiler_event.proto
@@ -6,8 +6,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package metrics;
 
 

diff --git a/chrome/common/metrics/proto/system_profile.proto b/chrome/common/metrics/proto/system_profile.proto
@@ -7,8 +7,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package metrics;
 
 // Next tag: 13

diff --git a/chrome/common/metrics/proto/user_action_event.proto b/chrome/common/metrics/proto/user_action_event.proto
@@ -7,8 +7,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package metrics;
 
 // Next tag: 3

diff --git a/chrome/common/safe_browsing/client_model.proto b/chrome/common/safe_browsing/client_model.proto
@@ -14,8 +14,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package safe_browsing;
 
 // This protocol buffer represents a machine learning model that is used in

diff --git a/chrome/common/safe_browsing/csd.proto b/chrome/common/safe_browsing/csd.proto
@@ -11,8 +11,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package safe_browsing;
 
 message ClientPhishingRequest {

diff --git a/chrome/tools/build/generate_policy_source.py b/chrome/tools/build/generate_policy_source.py
@@ -279,8 +279,6 @@ def _WritePolicyConstantSource(template_file_contents, args, opts):
 PROTO_HEAD = '''
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package enterprise_management;
 
 message StringList {

diff --git a/content/browser/speech/proto/google_streaming_api.proto b/content/browser/speech/proto/google_streaming_api.proto
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 syntax = "proto2";
-option optimize_for = LITE_RUNTIME;
 
 // TODO(hans): Commented out due to compilation errors.
 // option cc_api_version = 2;

diff --git a/dbus/test_proto.proto b/dbus/test_proto.proto
@@ -2,12 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-option optimize_for = LITE_RUNTIME;
-
 // This is a simple dummy protocol buffer that is used for testing handling of
 // protocol buffers in MessageReader and MessageWriter.
 
 message TestProto {
     optional string text = 1;
     optional int32 number = 2;
-}
+}
diff --git a/remoting/proto/audio.proto b/remoting/proto/audio.proto
@@ -6,8 +6,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package remoting;
 
 message AudioPacket {

diff --git a/remoting/proto/control.proto b/remoting/proto/control.proto
@@ -6,8 +6,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package remoting.protocol;
 
 message ClientDimensions {

diff --git a/remoting/proto/event.proto b/remoting/proto/event.proto
@@ -6,8 +6,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package remoting.protocol;
 
 // Defines a keyboard event.

diff --git a/remoting/proto/internal.proto b/remoting/proto/internal.proto
@@ -10,8 +10,6 @@ syntax = "proto2";
 import "control.proto";
 import "event.proto";
 
-option optimize_for = LITE_RUNTIME;
-
 package remoting.protocol;
 
 // Represents a message being sent on the control channel.

diff --git a/remoting/proto/mux.proto b/remoting/proto/mux.proto
@@ -6,8 +6,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package remoting.protocol;
 
 message MultiplexPacket {

diff --git a/remoting/proto/video.proto b/remoting/proto/video.proto
@@ -6,8 +6,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package remoting;
 
 message VideoPacketFormat {

diff --git a/sync/protocol/app_notification_specifics.proto b/sync/protocol/app_notification_specifics.proto
@@ -9,9 +9,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 // Properties of an app notification.

diff --git a/sync/protocol/app_setting_specifics.proto b/sync/protocol/app_setting_specifics.proto
@@ -11,9 +11,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 import "extension_setting_specifics.proto";

diff --git a/sync/protocol/app_specifics.proto b/sync/protocol/app_specifics.proto
@@ -9,9 +9,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 import "extension_specifics.proto";

diff --git a/sync/protocol/autofill_specifics.proto b/sync/protocol/autofill_specifics.proto
@@ -9,9 +9,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 // Properties of autofill sync objects.

diff --git a/sync/protocol/bookmark_specifics.proto b/sync/protocol/bookmark_specifics.proto
@@ -9,9 +9,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-option retain_unknown_fields = true;
-
 package sync_pb;
 
 // Properties of bookmark sync objects.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,8 +6,6 @@

		syntax = "proto2";

		option optimize_for = LITE_RUNTIME;

		package metrics;


Expand Down