diff options
| author |  Jorge Canizales <jcanizales@google.com> | 2015-06-02 01:03:03 -0700 |
|---|---|---|
| committer | Jorge Canizales <jcanizales@google.com> | 2015-06-02 01:03:03 -0700 |
| commit | 9d6b946a9ef3b735696fd99b088af37ccc67703f (patch) | |
| tree | 67f3e22bc1c78edf70c386842156bd685a22ea88 /Protobuf.podspec | |
| parent | e55a25c086da4ce066d9f0180b4f41e4c3c41cb7 (diff) | |
Reorder fields so it looks like exclude_files affects preserve_paths
Diffstat (limited to 'Protobuf.podspec')
| -rw-r--r-- | Protobuf.podspec | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Protobuf.podspec b/Protobuf.podspec index 1c1477af..8b12135f 100644 --- a/Protobuf.podspec +++ b/Protobuf.podspec @@ -15,16 +15,16 @@ Pod::Spec.new do |s| 'objectivec/google/protobuf/SourceContext.pbobjc.{h,m}', 'objectivec/google/protobuf/Timestamp.pbobjc.h', 'objectivec/google/protobuf/Wrappers.pbobjc.{h,m}' + # Timestamp.pbobjc.m and Duration.pbobjc.m are #imported by GPBWellKnownTypes.m. So we can't + # compile them (duplicate symbols), but we need them available for the importing: + s.preserve_paths = 'objectivec/google/protobuf/Duration.pbobjc.m', + 'objectivec/google/protobuf/Timestamp.pbobjc.m' # The following would cause duplicate symbol definitions. GPBProtocolBuffers is expected to be # left out, as it's an umbrella implementation file. For Api, Struct and Type, see issue #449. s.exclude_files = 'objectivec/GPBProtocolBuffers.m', 'objectivec/google/protobuf/Api.pbobjc.{h,m}', 'objectivec/google/protobuf/Struct.pbobjc.{h,m}', 'objectivec/google/protobuf/Type.pbobjc.{h,m}' - # Timestamp.pbobjc.m and Duration.pbobjc.m are #imported by GPBWellKnownTypes.m. So we can't - # compile them (duplicate symbols), but we need them available for the importing: - s.preserve_paths = 'objectivec/google/protobuf/Timestamp.pbobjc.m', - 'objectivec/google/protobuf/Duration.pbobjc.m' s.header_mappings_dir = 'objectivec' s.ios.deployment_target = '6.0' |