Zookeeper fixes

zhaoyingcan · Apr 1, 2016 · b11b34a · b11b34a
1 parent 5dec6e0
commit b11b34a
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 6 deletions.
diff --git a/BUILD b/BUILD
@@ -819,7 +819,7 @@ cc_library(
 cc_library(
   name = "grpc_zookeeper",
   srcs = [
-    "src/core/ext/resolver/zookeeper_resolver.c",
+    "src/core/ext/resolver/zookeeper/zookeeper_resolver.c",
   ],
   hdrs = [
     "include/grpc/grpc_zookeeper.h",

diff --git a/Makefile b/Makefile
@@ -3012,7 +3012,7 @@ endif
 
 
 LIBGRPC_ZOOKEEPER_SRC = \
-    src/core/ext/resolver/zookeeper_resolver.c \
+    src/core/ext/resolver/zookeeper/zookeeper_resolver.c \
 
 PUBLIC_HEADERS_C += \
     include/grpc/grpc_zookeeper.h \

diff --git a/build.yaml b/build.yaml
@@ -766,7 +766,7 @@ libs:
   public_headers:
   - include/grpc/grpc_zookeeper.h
   src:
-  - src/core/ext/resolver/zookeeper_resolver.c
+  - src/core/ext/resolver/zookeeper/zookeeper_resolver.c
   deps:
   - gpr
   - grpc

diff --git a/src/core/ext/resolver/zookeeper/zookeeper_resolver.c b/src/core/ext/resolver/zookeeper/zookeeper_resolver.c
@@ -31,8 +31,6 @@
  *
  */
 
-#include "src/core/lib/client_config/resolvers/zookeeper_resolver.h"
-
 #include <string.h>
 
 #include <grpc/support/alloc.h>

diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
@@ -5153,7 +5153,7 @@
     "name": "grpc_zookeeper", 
     "src": [
       "include/grpc/grpc_zookeeper.h", 
-      "src/core/ext/resolver/zookeeper_resolver.c"
+      "src/core/ext/resolver/zookeeper/zookeeper_resolver.c"
     ], 
     "third_party": false, 
     "type": "lib"
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,8 +31,6 @@ @@
      *
      */
-    #include "src/core/lib/client_config/resolvers/zookeeper_resolver.h"
     #include <string.h>
     #include <grpc/support/alloc.h>
@@ Expand Down @@