From 1cbb484729706cf89b140b8a746562a53d916e8b Mon Sep 17 00:00:00 2001
From: Muxi Yan <mxyan@google.com>
Date: Wed, 24 Oct 2018 10:45:07 -0700
Subject: [PATCH] Fix build failure

---
 .../GRPCClient/internal/GRPCCallOptions+internal.h          | 2 ++
 .../GRPCClient/private/GRPCCronetChannelFactory.m           | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/objective-c/GRPCClient/internal/GRPCCallOptions+internal.h b/src/objective-c/GRPCClient/internal/GRPCCallOptions+internal.h
index 406f268ef21..eb691b3acb1 100644
--- a/src/objective-c/GRPCClient/internal/GRPCCallOptions+internal.h
+++ b/src/objective-c/GRPCClient/internal/GRPCCallOptions+internal.h
@@ -18,6 +18,8 @@
 
 #import <Foundation/Foundation.h>
 
+#import "../GRPCCallOptions.h"
+
 @interface GRPCCallOptions ()
 
 /**
diff --git a/src/objective-c/GRPCClient/private/GRPCCronetChannelFactory.m b/src/objective-c/GRPCClient/private/GRPCCronetChannelFactory.m
index 70675784678..f976e1e06a9 100644
--- a/src/objective-c/GRPCClient/private/GRPCCronetChannelFactory.m
+++ b/src/objective-c/GRPCClient/private/GRPCCronetChannelFactory.m
@@ -53,14 +53,14 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (nullable grpc_channel *)createChannelWithHost:(NSString *)host
-                                     channelArgs:(nullable NSDictionary *)args {
+                                     channelArgs:(NSDictionary *)args {
   // Remove client authority filter since that is not supported
   args[@GRPC_ARG_DISABLE_CLIENT_AUTHORITY_FILTER] = [NSNumber numberWithInt:1];
 
-  grpc_channel_args *channelArgs = BuildChannelArgs(args);
+  grpc_channel_args *channelArgs = GRPCBuildChannelArgs(args);
   grpc_channel *unmanagedChannel =
       grpc_cronet_secure_channel_create(_cronetEngine, host.UTF8String, channelArgs, NULL);
-  FreeChannelArgs(channelArgs);
+  GRPCFreeChannelArgs(channelArgs);
   return unmanagedChannel;
 }