diff options
| author |  Jorge Canizales <jcanizales@google.com> | 2016-06-28 09:52:43 -0700 |
|---|---|---|
| committer | Jorge Canizales <jcanizales@google.com> | 2016-06-28 21:52:09 -0700 |
| commit | cc074d96474536cc056628f490454345f20342b8 (patch) | |
| tree | 56f2b2d03058cc147a65c51461b4643797a0e465 /src/objective-c/tests/Podfile | |
| parent | 0d3f178d4b8997bbf77da18bca77a83df6cf089d (diff) | |
Divide gRPC-Core in Interface & Impl subspecs
This works around the Cocoapods' linter header_mapping_dir restrictions.
Incidentally, it also removes the need to set build settings in the user
target.
Diffstat (limited to 'src/objective-c/tests/Podfile')
| -rw-r--r-- | src/objective-c/tests/Podfile | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/objective-c/tests/Podfile b/src/objective-c/tests/Podfile index 41814f18af..b627a92e4f 100644 --- a/src/objective-c/tests/Podfile +++ b/src/objective-c/tests/Podfile @@ -44,18 +44,15 @@ pre_install do |installer| grpc_core_spec = installer.pod_targets.find{|t| t.name == 'gRPC-Core'}.root_spec # Copied from gRPC-Core.podspec, except for the adjusted src_root: - src_root = "$(PODS_ROOT)/../#{GRPC_LOCAL_SRC}" - - public_build_settings = { + grpc_core_spec.pod_target_xcconfig = { 'GRPC_SRC_ROOT' => src_root, 'HEADER_SEARCH_PATHS' => '"$(inherited)" "$(GRPC_SRC_ROOT)/include"', - } - private_build_settings = public_build_settings.merge({ + 'USER_HEADER_SEARCH_PATHS' => '"$(GRPC_SRC_ROOT)"', + # If we don't set these two settings, `include/grpc/support/time.h` and + # `src/core/lib/support/string.h` shadow the system `<time.h>` and `<string.h>`, breaking the + # build. 'USE_HEADERMAP' => 'NO', 'ALWAYS_SEARCH_USER_PATHS' => 'NO', - 'USER_HEADER_SEARCH_PATHS' => '"$(GRPC_SRC_ROOT)"', - }) - grpc_core_spec.user_target_xcconfig = public_build_settings - grpc_core_spec.pod_target_xcconfig = private_build_settings + } end |