Zookeeper fixes

9 years ago · b11b34a71e
parent 5dec6e0e75
commit b11b34a71e
5 changed files with 4 additions and 6 deletions
--- a/2
+++ b/2
@ -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",
--- a/2
+++ b/2
@ -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 \
--- 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
--- 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>
--- 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"