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

Unified Diff: third_party/protobuf/java/src/test/java/com/google/protobuf/nested_extension.proto

Issue 11347026: Check in protobuf java code and generate lite jar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved target to android conditional Created 8 years, 1 month 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
Index: third_party/protobuf/java/src/test/java/com/google/protobuf/nested_extension.proto
diff --git a/third_party/protobuf/src/google/protobuf/unittest_lite_imports_nonlite.proto b/third_party/protobuf/java/src/test/java/com/google/protobuf/nested_extension.proto
similarity index 82%
copy from third_party/protobuf/src/google/protobuf/unittest_lite_imports_nonlite.proto
copy to third_party/protobuf/java/src/test/java/com/google/protobuf/nested_extension.proto
index d52cb8cc36d8924a3454f9170f6b338f14a59c5c..9fe5d560c9690fe5c2d4212c7911f97a74122b42 100644
--- a/third_party/protobuf/src/google/protobuf/unittest_lite_imports_nonlite.proto
+++ b/third_party/protobuf/java/src/test/java/com/google/protobuf/nested_extension.proto
@@ -28,16 +28,18 @@
// (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: kenton@google.com (Kenton Varda)
+// Author: Darick Tong (darick@google.com)
//
-// Tests that a "lite" message can import a regular message.
+// A proto file with nested extensions. Note that this must be defined in
+// a separate file to properly test the initialization of the outer class.
-package protobuf_unittest;
-import "google/protobuf/unittest.proto";
+import "com/google/protobuf/non_nested_extension.proto";
-option optimize_for = LITE_RUNTIME;
+package protobuf_unittest;
-message TestLiteImportsNonlite {
- optional TestAllTypes message = 1;
+message MyNestedExtension {
+ extend MessageToBeExtended {
+ optional MessageToBeExtended recursiveExtension = 2;
+ }
}

Powered by Google App Engine
This is Rietveld 408576698