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 /remoting/proto | |
| 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 'remoting/proto')
| -rw-r--r-- | remoting/proto/audio.proto | 2 | ||||
| -rw-r--r-- | remoting/proto/control.proto | 2 | ||||
| -rw-r--r-- | remoting/proto/event.proto | 2 | ||||
| -rw-r--r-- | remoting/proto/internal.proto | 2 | ||||
| -rw-r--r-- | remoting/proto/mux.proto | 2 | ||||
| -rw-r--r-- | remoting/proto/video.proto | 2 |
6 files changed, 12 insertions, 0 deletions
diff --git a/remoting/proto/audio.proto b/remoting/proto/audio.proto index b6674c9..dacfb5e 100644 --- a/remoting/proto/audio.proto +++ b/remoting/proto/audio.proto @@ -6,6 +6,8 @@ syntax = "proto2"; +option optimize_for = LITE_RUNTIME; + package remoting; message AudioPacket { diff --git a/remoting/proto/control.proto b/remoting/proto/control.proto index 951beb6..20f0b9d 100644 --- a/remoting/proto/control.proto +++ b/remoting/proto/control.proto @@ -6,6 +6,8 @@ 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 b3769b5..f06618e 100644 --- a/remoting/proto/event.proto +++ b/remoting/proto/event.proto @@ -6,6 +6,8 @@ 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 ed6a295..323b740 100644 --- a/remoting/proto/internal.proto +++ b/remoting/proto/internal.proto @@ -10,6 +10,8 @@ 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 1dee362..ff0a8f6 100644 --- a/remoting/proto/mux.proto +++ b/remoting/proto/mux.proto @@ -6,6 +6,8 @@ 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 eff9a77..01c57d4 100644 --- a/remoting/proto/video.proto +++ b/remoting/proto/video.proto @@ -6,6 +6,8 @@ syntax = "proto2"; +option optimize_for = LITE_RUNTIME; + package remoting; message VideoPacketFormat { |