From 32aad8a11c8726cb02b0551b6ae6dc4d07029a0b Mon Sep 17 00:00:00 2001
From: Muxi Yan <mxyan@google.com>
Date: Wed, 24 Jul 2019 15:46:56 -0700
Subject: [PATCH] More fixes

---
 src/objective-c/GRPCClient/GRPCCall.m                        | 2 --
 .../private/GRPCCore/GRPCCoreCronet/GRPCCoreCronetFactory.h  | 2 +-
 .../private/GRPCCore/GRPCCoreCronet/GRPCCoreCronetFactory.m  | 4 ++--
 .../GRPCCore/GRPCCoreCronet/GRPCCronetChannelFactory.h       | 2 +-
 .../GRPCCore/GRPCCoreCronet/GRPCCronetChannelFactory.m       | 4 ++--
 src/objective-c/ProtoRPC/ProtoService.m                      | 5 +++++
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/objective-c/GRPCClient/GRPCCall.m b/src/objective-c/GRPCClient/GRPCCall.m
index 2f2a89c20ac..c62cb03ddd8 100644
--- a/src/objective-c/GRPCClient/GRPCCall.m
+++ b/src/objective-c/GRPCClient/GRPCCall.m
@@ -18,13 +18,11 @@
 
 #import "GRPCCall.h"
 
-#include <grpc/support/time.h>
 #import "GRPCCallOptions.h"
 #import "GRPCInterceptor.h"
 #import "GRPCCall+Interceptor.h"
 
 #import "private/GRPCTransport+Private.h"
-#import "private/GRPCCore/GRPCCoreFactory.h"
 
 NSString *const kGRPCHeadersKey = @"io.grpc.HeadersKey";
 NSString *const kGRPCTrailersKey = @"io.grpc.TrailersKey";
diff --git a/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCoreCronetFactory.h b/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCoreCronetFactory.h
index 8c781f4a448..f1ad1b05e44 100644
--- a/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCoreCronetFactory.h
+++ b/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCoreCronetFactory.h
@@ -16,7 +16,7 @@
  *
  */
 
-#import "GRPCCoreFactory.h"
+#import "../GRPCCoreFactory.h"
 
 @interface GRPCCoreCronetFactory : NSObject<GRPCCoreTransportFactory>
 
diff --git a/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCoreCronetFactory.m b/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCoreCronetFactory.m
index 661df006e57..0a19e31999e 100644
--- a/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCoreCronetFactory.m
+++ b/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCoreCronetFactory.m
@@ -21,8 +21,8 @@
 #import <GRPCClient/GRPCTransport.h>
 #import <GRPCClient/GRPCCall+Cronet.h>
 
-#import "GRPCCoreFactory.h"
-#import "GRPCCallInternal.h"
+#import "../GRPCCoreFactory.h"
+#import "../GRPCCallInternal.h"
 #import "GRPCCronetChannelFactory.h"
 
 static GRPCCoreCronetFactory *gGRPCCoreCronetFactory = nil;
diff --git a/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCronetChannelFactory.h b/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCronetChannelFactory.h
index 738dfdb7370..138ddf1f730 100644
--- a/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCronetChannelFactory.h
+++ b/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCronetChannelFactory.h
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#import "GRPCChannelFactory.h"
+#import "../GRPCChannelFactory.h"
 
 @class GRPCChannel;
 typedef struct stream_engine stream_engine;
diff --git a/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCronetChannelFactory.m b/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCronetChannelFactory.m
index 8744d27e04f..da3f3afd855 100644
--- a/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCronetChannelFactory.m
+++ b/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCronetChannelFactory.m
@@ -18,8 +18,8 @@
 
 #import "GRPCCronetChannelFactory.h"
 
-#import "ChannelArgsUtil.h"
-#import "GRPCChannel.h"
+#import "../ChannelArgsUtil.h"
+#import "../GRPCChannel.h"
 
 #import <Cronet/Cronet.h>
 #include <grpc/grpc_cronet.h>
diff --git a/src/objective-c/ProtoRPC/ProtoService.m b/src/objective-c/ProtoRPC/ProtoService.m
index 3a8417d0afa..c3684c8e2f2 100644
--- a/src/objective-c/ProtoRPC/ProtoService.m
+++ b/src/objective-c/ProtoRPC/ProtoService.m
@@ -32,9 +32,14 @@
   GRPCCallOptions *_callOptions;
 }
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnonnull"
+// Do not call the default init method
 - (instancetype)init {
+  [NSException raise:NSGenericException format:@"Do not call init method of ProtoService"];
   return [self initWithHost:nil packageName:nil serviceName:nil callOptions:nil];
 }
+#pragma clang diasnostic pop
 
 // Designated initializer
 - (instancetype)initWithHost:(NSString *)host