summaryrefslogtreecommitdiffstats
path: root/remoting/proto
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 /remoting/proto
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 'remoting/proto')
-rw-r--r--remoting/proto/audio.proto2
-rw-r--r--remoting/proto/control.proto2
-rw-r--r--remoting/proto/event.proto2
-rw-r--r--remoting/proto/internal.proto2
-rw-r--r--remoting/proto/mux.proto2
-rw-r--r--remoting/proto/video.proto2
6 files changed, 0 insertions, 12 deletions
diff --git a/remoting/proto/audio.proto b/remoting/proto/audio.proto
index dacfb5e..b6674c9 100644
--- 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
index 20f0b9d..951beb6 100644
--- 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
index f06618e..b3769b5 100644
--- 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
index 323b740..ed6a295 100644
--- 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
index ff0a8f6..1dee362 100644
--- 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
index 01c57d4..eff9a77 100644
--- 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 {