Index: third_party/protobuf/java/compatibility_tests/v2.5.0/protos/src/proto/google/protobuf/unittest_embed_optimize_for.proto |
diff --git a/third_party/protobuf/python/google/protobuf/internal/any_test.proto b/third_party/protobuf/java/compatibility_tests/v2.5.0/protos/src/proto/google/protobuf/unittest_embed_optimize_for.proto |
similarity index 69% |
copy from third_party/protobuf/python/google/protobuf/internal/any_test.proto |
copy to third_party/protobuf/java/compatibility_tests/v2.5.0/protos/src/proto/google/protobuf/unittest_embed_optimize_for.proto |
index cd641ca0b8efaab4d60767f359490946f90400fb..fa1762594e8960814d5ad052ded3a5b9520d4f6d 100644 |
--- a/third_party/protobuf/python/google/protobuf/internal/any_test.proto |
+++ b/third_party/protobuf/java/compatibility_tests/v2.5.0/protos/src/proto/google/protobuf/unittest_embed_optimize_for.proto |
@@ -1,6 +1,6 @@ |
// Protocol Buffers - Google's data interchange format |
// Copyright 2008 Google Inc. All rights reserved. |
-// https://developers.google.com/protocol-buffers/ |
+// http://code.google.com/p/protobuf/ |
// |
// Redistribution and use in source and binary forms, with or without |
// modification, are permitted provided that the following conditions are |
@@ -28,15 +28,23 @@ |
// (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: jieluo@google.com (Jie Luo) |
+// Author: kenton@google.com (Kenton Varda) |
+// Based on original Protocol Buffers design by |
+// Sanjay Ghemawat, Jeff Dean, and others. |
+// |
+// A proto file which imports a proto file that uses optimize_for = CODE_SIZE. |
-syntax = "proto3"; |
+import "google/protobuf/unittest_optimize_for.proto"; |
-package google.protobuf.internal; |
+package protobuf_unittest; |
-import "google/protobuf/any.proto"; |
+// We optimize for speed here, but we are importing a proto that is optimized |
+// for code size. |
+option optimize_for = SPEED; |
-message TestAny { |
- google.protobuf.Any value = 1; |
- int32 int_value = 2; |
+message TestEmbedOptimizedForSize { |
+ // Test that embedding a message which has optimize_for = CODE_SIZE into |
+ // one optimized for speed works. |
+ optional TestOptimizedForSize optional_message = 1; |
+ repeated TestOptimizedForSize repeated_message = 2; |
} |