Fixed incorrect merges

src/core/lib/iomgr/network_status_tracker.c

@@ -65,11 +65,6 @@ void grpc_destroy_network_status_monitor() {
   gpr_mu_destroy(&g_endpoint_mutex);
 }
 
-void grpc_network_status_init(void) {
-  gpr_mu_init(&g_endpoint_mutex);
-  // TODO(makarandd): Install callback with OS to monitor network status.
-}
-
 void grpc_network_status_register_endpoint(grpc_endpoint *ep) {
   gpr_mu_lock(&g_endpoint_mutex);
   if (head == NULL) {

tools/distrib/python/grpcio_tools/setup.py

@@ -140,14 +140,14 @@ def package_data():
 
 def extension_modules():
   if BUILD_WITH_CYTHON:
-    plugin_sources = ['grpc/tools/_protoc_compiler.pyx']
+    plugin_sources = [os.path.join('grpc', 'tools', '_protoc_compiler.pyx')]
   else:
-    plugin_sources = ['grpc/tools/_protoc_compiler.cpp']
+    plugin_sources = [os.path.join('grpc', 'tools', '_protoc_compiler.cpp')]
-  plugin_sources += [
+    plugin_sources += [
-      'grpc/tools/main.cc',
+      os.path.join('grpc', 'tools', 'main.cc'),
-      'grpc_root/src/compiler/python_generator.cc'] + [
+      os.path.join('grpc_root', 'src', 'compiler', 'python_generator.cc')] + [
-      os.path.join(protoc_lib_deps.CC_INCLUDE, cc_file)
+      os.path.join(CC_INCLUDE, cc_file)
-      for cc_file in protoc_lib_deps.CC_FILES]
+      for cc_file in CC_FILES]
   plugin_ext = extension.Extension(
       name='grpc.tools._protoc_compiler',
       sources=plugin_sources,