diff options
author | Colin Cross <ccross@android.com> | 2018-11-04 17:36:06 -0800 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-11-06 23:59:00 +0000 |
commit | 90d15808211c046633273ba4b8ec09550df99f15 (patch) | |
tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 /java/core/src/test/proto/com/google/protobuf/lazy_fields_lite.proto | |
parent | 8e63d53115f3358d3a9431aa06a81185e6823c7d (diff) | |
download | protobuf-javalite-90d15808211c046633273ba4b8ec09550df99f15.tar.gz |
Revert "Merge tag 'v3.0.1-javalite'"
This reverts commit f4fe6ab6726e235448020c5fd203e4fc1dad728e, reversing
changes made to 6e463f53f1f82dfe0a74e25ae729601a9678730c.
Change-Id: I451a710a7b755868c8d6a8de56a0b9bb55fedad6
(cherry picked from commit 61f57327388b1c133011da01545f0a24e09fddf0)
Diffstat (limited to 'java/core/src/test/proto/com/google/protobuf/lazy_fields_lite.proto')
-rw-r--r-- | java/core/src/test/proto/com/google/protobuf/lazy_fields_lite.proto | 71 |
1 files changed, 0 insertions, 71 deletions
diff --git a/java/core/src/test/proto/com/google/protobuf/lazy_fields_lite.proto b/java/core/src/test/proto/com/google/protobuf/lazy_fields_lite.proto deleted file mode 100644 index 5580f72d..00000000 --- a/java/core/src/test/proto/com/google/protobuf/lazy_fields_lite.proto +++ /dev/null @@ -1,71 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// Author: Naoki Iwasaki (niwasaki@google.com) -// -// A proto file with lazy fields - -syntax = "proto2"; - -package protobuf_unittest; - -option optimize_for = LITE_RUNTIME; - -message LazyMessageLite { - optional int32 num = 1; - optional int32 num_with_default = 2 [default = 421]; - optional LazyInnerMessageLite inner = 3 [lazy = true]; - repeated LazyInnerMessageLite repeated_inner = 4 [lazy = true]; - - oneof oneof_field { - int32 oneof_num = 5; - LazyInnerMessageLite oneof_inner = 6 [lazy = true]; - } -} - -message LazyInnerMessageLite { - optional int32 num = 1; - optional int32 num_with_default = 2 [default = 42]; - optional LazyNestedInnerMessageLite nested = 3 [lazy = true]; - - extensions 1000 to max; -} - -message LazyExtension { - extend LazyInnerMessageLite { - optional LazyExtension extension = 1000; - } - optional string name = 1; -} - -message LazyNestedInnerMessageLite { - optional int32 num = 1; - optional int32 num_with_default = 2 [default = 4]; -} |