aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Yuchen Zeng <zyc@google.com>2016-07-19 11:49:10 -0700
committerGravatar Yuchen Zeng <zyc@google.com>2016-07-19 11:49:10 -0700
commitdd5b9a8086ef9a43c909d20bf61832f300bd7039 (patch)
tree8f76f18d6c2dd82b1aad1f9e849984559a17c430
parent1318479011fa7d2e2859c20c89748b098618a5f8 (diff)
Fix sanity check
-rw-r--r--build.yaml3
-rwxr-xr-xtools/run_tests/sanity/check_sources_and_headers.py3
-rw-r--r--tools/run_tests/sources_and_headers.json5
3 files changed, 7 insertions, 4 deletions
diff --git a/build.yaml b/build.yaml
index 4c9dbd046d..fa4dd5a691 100644
--- a/build.yaml
+++ b/build.yaml
@@ -776,6 +776,8 @@ filegroups:
src:
- src/cpp/ext/reflection.grpc.pb.cc
- src/cpp/ext/reflection.pb.cc
+ uses:
+ - grpc++_codegen_proto
libs:
- name: gpr
build: all
@@ -977,7 +979,6 @@ libs:
- grpc++
filegroups:
- grpc++_reflection_proto
- - grpc++_codegen_proto
- name: grpc++_reflection_codegen
build: private
language: c++
diff --git a/tools/run_tests/sanity/check_sources_and_headers.py b/tools/run_tests/sanity/check_sources_and_headers.py
index c028499ca6..28c1dc46d7 100755
--- a/tools/run_tests/sanity/check_sources_and_headers.py
+++ b/tools/run_tests/sanity/check_sources_and_headers.py
@@ -55,7 +55,8 @@ def target_has_header(target, name):
for dep in target['deps']:
if target_has_header(get_target(dep), name):
return True
- if name == 'src/core/lib/profiling/stap_probes.h':
+ if name in ['src/core/lib/profiling/stap_probes.h',
+ 'src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h']:
return True
return False
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index 451f535a2a..87e5001c09 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -4360,7 +4360,6 @@
{
"deps": [
"grpc++",
- "grpc++_codegen_proto",
"grpc++_reflection_proto"
],
"headers": [
@@ -6760,7 +6759,9 @@
"type": "filegroup"
},
{
- "deps": [],
+ "deps": [
+ "grpc++_codegen_proto"
+ ],
"headers": [
"include/grpc++/ext/reflection.grpc.pb.h",
"include/grpc++/ext/reflection.pb.h"