diff options
author | Thomas Van Lenten <thomasvl@google.com> | 2018-03-28 16:53:39 -0400 |
---|---|---|
committer | Thomas Van Lenten <thomasvl@google.com> | 2018-04-02 09:54:29 -0400 |
commit | bca797dac9c5c6f549be12e2bc9addbf51b1d18f (patch) | |
tree | 7c7847cd60c0ca9a1f65829737538794960fb323 /objectivec/google/protobuf/SourceContext.pbobjc.h | |
parent | 7bf47a6b5d10382a4b427677cf7ca9288f4e2833 (diff) | |
download | protobuf-bca797dac9c5c6f549be12e2bc9addbf51b1d18f.tar.gz protobuf-bca797dac9c5c6f549be12e2bc9addbf51b1d18f.tar.bz2 protobuf-bca797dac9c5c6f549be12e2bc9addbf51b1d18f.zip |
Trim imports for bundled generated protos.
To avoid a cycle between headers, have the WKTs use minimal imports instead
of using the helper to get everything from the library.
Fixes https://github.com/google/protobuf/issues/4301
Fixes https://github.com/google/protobuf/issues/4403
Diffstat (limited to 'objectivec/google/protobuf/SourceContext.pbobjc.h')
-rw-r--r-- | objectivec/google/protobuf/SourceContext.pbobjc.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/objectivec/google/protobuf/SourceContext.pbobjc.h b/objectivec/google/protobuf/SourceContext.pbobjc.h index 799d190a..e4923959 100644 --- a/objectivec/google/protobuf/SourceContext.pbobjc.h +++ b/objectivec/google/protobuf/SourceContext.pbobjc.h @@ -8,9 +8,13 @@ #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import <Protobuf/GPBProtocolBuffers.h> + #import <Protobuf/GPBDescriptor.h> + #import <Protobuf/GPBMessage.h> + #import <Protobuf/GPBRootObject.h> #else - #import "GPBProtocolBuffers.h" + #import "GPBDescriptor.h" + #import "GPBMessage.h" + #import "GPBRootObject.h" #endif #if GOOGLE_PROTOBUF_OBJC_VERSION < 30002 |