Index: third_party/protobuf/objectivec/GPBProtocolBuffers.h |
diff --git a/third_party/protobuf/objectivec/GPBProtocolBuffers.h b/third_party/protobuf/objectivec/GPBProtocolBuffers.h |
index 68d8854eb8e7ffd4a4476b31e30783cd519a3ff6..677903ed76b67a805aa0ec5c5056f639395b60e4 100644 |
--- a/third_party/protobuf/objectivec/GPBProtocolBuffers.h |
+++ b/third_party/protobuf/objectivec/GPBProtocolBuffers.h |
@@ -44,33 +44,14 @@ |
#import "GPBWellKnownTypes.h" |
#import "GPBWireFormat.h" |
-// This CPP symbol can be defined to use imports that match up to the framework |
-// imports needed when using CocoaPods. |
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS) |
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0 |
-#endif |
- |
// Well-known proto types |
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS |
- #import <Protobuf/Any.pbobjc.h> |
- #import <Protobuf/Api.pbobjc.h> |
- #import <Protobuf/Duration.pbobjc.h> |
- #import <Protobuf/Empty.pbobjc.h> |
- #import <Protobuf/FieldMask.pbobjc.h> |
- #import <Protobuf/SourceContext.pbobjc.h> |
- #import <Protobuf/Struct.pbobjc.h> |
- #import <Protobuf/Timestamp.pbobjc.h> |
- #import <Protobuf/Type.pbobjc.h> |
- #import <Protobuf/Wrappers.pbobjc.h> |
-#else |
- #import "google/protobuf/Any.pbobjc.h" |
- #import "google/protobuf/Api.pbobjc.h" |
- #import "google/protobuf/Duration.pbobjc.h" |
- #import "google/protobuf/Empty.pbobjc.h" |
- #import "google/protobuf/FieldMask.pbobjc.h" |
- #import "google/protobuf/SourceContext.pbobjc.h" |
- #import "google/protobuf/Struct.pbobjc.h" |
- #import "google/protobuf/Timestamp.pbobjc.h" |
- #import "google/protobuf/Type.pbobjc.h" |
- #import "google/protobuf/Wrappers.pbobjc.h" |
-#endif |
+#import "google/protobuf/Any.pbobjc.h" |
+#import "google/protobuf/Api.pbobjc.h" |
+#import "google/protobuf/Duration.pbobjc.h" |
+#import "google/protobuf/Empty.pbobjc.h" |
+#import "google/protobuf/FieldMask.pbobjc.h" |
+#import "google/protobuf/SourceContext.pbobjc.h" |
+#import "google/protobuf/Struct.pbobjc.h" |
+#import "google/protobuf/Timestamp.pbobjc.h" |
+#import "google/protobuf/Type.pbobjc.h" |
+#import "google/protobuf/Wrappers.pbobjc.h" |