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

Unified Diff: third_party/protobuf/objectivec/GPBProtocolBuffers_RuntimeSupport.h

Issue 1291903002: Pull new version of protobuf sources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Build fix attempts Created 5 years, 4 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/objectivec/GPBProtocolBuffers_RuntimeSupport.h
diff --git a/third_party/protobuf/src/google/protobuf/unittest_import_public_lite.proto b/third_party/protobuf/objectivec/GPBProtocolBuffers_RuntimeSupport.h
similarity index 80%
copy from third_party/protobuf/src/google/protobuf/unittest_import_public_lite.proto
copy to third_party/protobuf/objectivec/GPBProtocolBuffers_RuntimeSupport.h
index d077563cbd84d7be6daddec3f553cb564f23da0a..fea75b93bc2568353567eefaaf33d82c653f48ee 100644
--- a/third_party/protobuf/src/google/protobuf/unittest_import_public_lite.proto
+++ b/third_party/protobuf/objectivec/GPBProtocolBuffers_RuntimeSupport.h
@@ -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,15 +28,13 @@
// (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)
+// This header is meant to only be used by the generated source, it should not
+// be included in code using protocol buffers.
+#import "GPBProtocolBuffers.h"
-package protobuf_unittest_import;
-
-option optimize_for = LITE_RUNTIME;
-
-option java_package = "com.google.protobuf";
-
-message PublicImportMessageLite {
- optional int32 e = 1;
-}
+#import "GPBDescriptor_PackagePrivate.h"
+#import "GPBExtensionInternals.h"
+#import "GPBMessage_PackagePrivate.h"
+#import "GPBRootObject_PackagePrivate.h"
+#import "GPBUtilities_PackagePrivate.h"
« no previous file with comments | « third_party/protobuf/objectivec/GPBProtocolBuffers.m ('k') | third_party/protobuf/objectivec/GPBRootObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698