From f9778f8f0db2b21333ea5805edb2492786da8003 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Fri, 1 Apr 2016 10:37:50 -0700
Subject: [PATCH] Tweak zookeeper
---
BUILD | 3 +--
Makefile | 2 +-
build.yaml | 4 +---
tools/run_tests/sources_and_headers.json | 6 ++----
4 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/BUILD b/BUILD
index 7bd51054e5..cdf6ddfa3f 100644
--- a/BUILD
+++ b/BUILD
@@ -819,8 +819,7 @@ cc_library(
cc_library(
name = "grpc_zookeeper",
srcs = [
- "src/core/lib/client_config/resolvers/zookeeper_resolver.h",
- "src/core/lib/client_config/resolvers/zookeeper_resolver.c",
+ "src/core/ext/resolver/zookeeper_resolver.c",
],
hdrs = [
"include/grpc/grpc_zookeeper.h",
diff --git a/Makefile b/Makefile
index 204a34008b..de6802d6b6 100644
--- a/Makefile
+++ b/Makefile
@@ -3000,7 +3000,7 @@ endif
LIBGRPC_ZOOKEEPER_SRC = \
- src/core/lib/client_config/resolvers/zookeeper_resolver.c \
+ src/core/ext/resolver/zookeeper_resolver.c \
PUBLIC_HEADERS_C += \
include/grpc/grpc_zookeeper.h \
diff --git a/build.yaml b/build.yaml
index b50f66ae37..e58c33c85b 100644
--- a/build.yaml
+++ b/build.yaml
@@ -765,10 +765,8 @@ libs:
language: c
public_headers:
- include/grpc/grpc_zookeeper.h
- headers:
- - src/core/lib/client_config/resolvers/zookeeper_resolver.h
src:
- - src/core/lib/client_config/resolvers/zookeeper_resolver.c
+ - src/core/ext/resolver/zookeeper_resolver.c
deps:
- gpr
- grpc
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index 824b3b85a1..307f00071f 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -5063,15 +5063,13 @@
"grpc"
],
"headers": [
- "include/grpc/grpc_zookeeper.h",
- "src/core/lib/client_config/resolvers/zookeeper_resolver.h"
+ "include/grpc/grpc_zookeeper.h"
],
"language": "c",
"name": "grpc_zookeeper",
"src": [
"include/grpc/grpc_zookeeper.h",
- "src/core/lib/client_config/resolvers/zookeeper_resolver.c",
- "src/core/lib/client_config/resolvers/zookeeper_resolver.h"
+ "src/core/ext/resolver/zookeeper_resolver.c"
],
"third_party": false,
"type": "lib"
--
GitLab