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

Unified Diff: third_party/protobuf/python/google/protobuf/internal/import_test_package/outer.proto

Issue 1842653006: Update //third_party/protobuf to version 3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 8 months 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/python/google/protobuf/internal/import_test_package/outer.proto
diff --git a/third_party/protobuf/src/google/protobuf/unittest_import_public.proto b/third_party/protobuf/python/google/protobuf/internal/import_test_package/outer.proto
similarity index 86%
copy from third_party/protobuf/src/google/protobuf/unittest_import_public.proto
copy to third_party/protobuf/python/google/protobuf/internal/import_test_package/outer.proto
index ea5d1b13fea77a432cecc0980664c020159d108a..a27fb5c8f4207f0b75ee002fc765c393db7f08b3 100644
--- a/third_party/protobuf/src/google/protobuf/unittest_import_public.proto
+++ b/third_party/protobuf/python/google/protobuf/internal/import_test_package/outer.proto
@@ -1,6 +1,6 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
-// http://code.google.com/p/protobuf/
+// 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
@@ -28,13 +28,12 @@
// (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: liujisi@google.com (Pherl Liu)
+syntax = "proto2";
+package google.protobuf.python.internal.import_test_package;
-package protobuf_unittest_import;
+import "google/protobuf/internal/import_test_package/inner.proto";
-option java_package = "com.google.protobuf.test";
-
-message PublicImportMessage {
- optional int32 e = 1;
+message Outer {
+ optional Inner inner = 1;
}

Powered by Google App Engine
This is Rietveld 408576698