diff options
| author | Thomas Van Lenten <thomasvl@google.com> | 2016-06-27 14:24:59 -0400 |
|---|---|---|
| committer | Thomas Van Lenten <thomasvl@google.com> | 2016-07-07 08:45:18 -0400 |
| commit | be0d7f66644d9ee36caac43cee21e679b4503015 (patch) | |
| tree | 340eeac896e55f38f6e9e37fe03a77cf1baac12a /objectivec/GPBProtocolBuffers.m | |
| parent | ec4589736e71a332d63c129c1cf8e532098c2633 (diff) | |
| download | protobuf-be0d7f66644d9ee36caac43cee21e679b4503015.tar.gz protobuf-be0d7f66644d9ee36caac43cee21e679b4503015.tar.bz2 protobuf-be0d7f66644d9ee36caac43cee21e679b4503015.zip | |
Don't #import the .m files.
As bazel folks are looking at getting auto generation of module maps going and
the importing of sources files causes issues there. We were only do it to
hack around some of the apple linker behaviors around objc classes and
categories, but even that isn't complete and CocoaPods was already doing -ObjC,
and developers not using pods could have still needed it to ensure everything
was linked anyways; so drop the hack of importing sources.
Diffstat (limited to 'objectivec/GPBProtocolBuffers.m')
| -rw-r--r-- | objectivec/GPBProtocolBuffers.m | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/objectivec/GPBProtocolBuffers.m b/objectivec/GPBProtocolBuffers.m index 73939391..d04c8be1 100644 --- a/objectivec/GPBProtocolBuffers.m +++ b/objectivec/GPBProtocolBuffers.m @@ -54,15 +54,13 @@ #import "GPBWellKnownTypes.m" #import "GPBWireFormat.m" -// Duration and Timestamp are #imported into GPBWellKnownTypes.m to the -// Objective C categories added will always be linked in with the classes. #import "google/protobuf/Any.pbobjc.m" #import "google/protobuf/Api.pbobjc.m" -// #import "google/protobuf/Duration.pbobjc.m" +#import "google/protobuf/Duration.pbobjc.m" #import "google/protobuf/Empty.pbobjc.m" #import "google/protobuf/FieldMask.pbobjc.m" #import "google/protobuf/SourceContext.pbobjc.m" #import "google/protobuf/Struct.pbobjc.m" -// #import "google/protobuf/Timestamp.pbobjc.m" +#import "google/protobuf/Timestamp.pbobjc.m" #import "google/protobuf/Type.pbobjc.m" #import "google/protobuf/Wrappers.pbobjc.m" |