diff options
| author |  Jorge Canizales <jcanizales@google.com> | 2016-07-13 14:44:33 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-07-13 14:44:33 -0700 |
| commit | 800a71cfb3b5fdc39a51e3ef52b1f80bf7790993 (patch) | |
| tree | b6ae27b2c025f6794d235732e57a16ce86817a37 /src/objective-c/ProtoRPC/ProtoRPC.m | |
| parent | cb6d26afd0ac23e433396d0a4f9c06ef169df599 (diff) | |
Don't always import Protobuf like a framework
If the macro isn't set, e.g. for Bazel compilations, import the way it was done before https://github.com/grpc/grpc/commit/fb4a54541a6e00c43e1671cda0a25e2eda4792df.
Diffstat (limited to 'src/objective-c/ProtoRPC/ProtoRPC.m')
| -rw-r--r-- | src/objective-c/ProtoRPC/ProtoRPC.m | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/objective-c/ProtoRPC/ProtoRPC.m b/src/objective-c/ProtoRPC/ProtoRPC.m index e7232f2683..83d1b655e8 100644 --- a/src/objective-c/ProtoRPC/ProtoRPC.m +++ b/src/objective-c/ProtoRPC/ProtoRPC.m @@ -33,7 +33,11 @@ #import "ProtoRPC.h" -#import <Protobuf/GPBProtocolBuffers.h> +#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS + #import <Protobuf/GPBProtocolBuffers.h> +#else + #import <GPBProtocolBuffers.h> +#endif #import <RxLibrary/GRXWriteable.h> #import <RxLibrary/GRXWriter+Transformations.h> |