From b9be58ee5ac301788a35c26c37fea6f69a0e61fc Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Mon, 1 Aug 2016 11:25:59 -0700 Subject: Use dedicated build configuration 'Cronet' for the new target --- src/objective-c/tests/Podfile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/objective-c/tests/Podfile') diff --git a/src/objective-c/tests/Podfile b/src/objective-c/tests/Podfile index 067d37eccc..51dd1b8358 100644 --- a/src/objective-c/tests/Podfile +++ b/src/objective-c/tests/Podfile @@ -31,8 +31,8 @@ GRPC_LOCAL_SRC = '../../..' pod 'RemoteTest', :path => "RemoteTestClient" if target_name == 'InteropTestsRemoteWithCronet' - pod 'CronetFramework', :podspec => "#{GRPC_LOCAL_SRC}/src/objective-c" pod 'gRPC-Core/Cronet-Implementation', :path => GRPC_LOCAL_SRC + pod 'CronetFramework', :podspec => "#{GRPC_LOCAL_SRC}/src/objective-c" end end end @@ -90,9 +90,14 @@ post_install do |installer| config.build_settings['GCC_WARN_ABOUT_RETURN_TYPE'] = 'NO' end end + + # Activate Cronet for the dedicated build configuration 'Cronet', which will be used solely by + # the test target 'InteropTestsRemoteWithCronet' if target.name == 'gRPC' target.build_configurations.each do |config| - config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) COCOAPODS=1 GRPC_COMPILE_WITH_CRONET=1' + if config.name == 'Cronet' + config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) COCOAPODS=1 GRPC_COMPILE_WITH_CRONET=1' + end end end end -- cgit v1.2.3