aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar David G. Quintas <dgq@google.com>2017-05-01 13:39:03 -0700
committerGravatar GitHub <noreply@github.com>2017-05-01 13:39:03 -0700
commit3d88269c130ff844854bf8168dc3dd07ac765bab (patch)
tree7a6e5f930344f7aabdc716574ddc2bda4f59dcb9 /tools
parent6626a86923aaebae86aeeba151c99ed3089d02fc (diff)
parent4e9bef0f1ef7f20ad2806a56248ee4752a728fcf (diff)
Merge pull request #10933 from dgquintas/thrift_again
Remove leftover thrift mentions
Diffstat (limited to 'tools')
-rw-r--r--tools/run_tests/generated/sources_and_headers.json21
-rwxr-xr-xtools/run_tests/sanity/check_submodules.sh1
2 files changed, 1 insertions, 21 deletions
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json
index 5eba7fbb69..a5af10e507 100644
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@@ -6026,8 +6026,7 @@
"grpc++_codegen_base_src",
"grpc++_codegen_proto",
"grpc++_config_proto",
- "grpc_test_util",
- "thrift_util"
+ "grpc_test_util"
],
"headers": [
"src/proto/grpc/health/v1/health.grpc.pb.h",
@@ -9129,23 +9128,5 @@
],
"third_party": false,
"type": "filegroup"
- },
- {
- "deps": [
- "grpc++_codegen_base"
- ],
- "headers": [
- "include/grpc++/impl/codegen/thrift_serializer.h",
- "include/grpc++/impl/codegen/thrift_utils.h"
- ],
- "is_filegroup": true,
- "language": "c++",
- "name": "thrift_util",
- "src": [
- "include/grpc++/impl/codegen/thrift_serializer.h",
- "include/grpc++/impl/codegen/thrift_utils.h"
- ],
- "third_party": false,
- "type": "filegroup"
}
]
diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh
index 0a9c1cc046..6be7a39d07 100755
--- a/tools/run_tests/sanity/check_submodules.sh
+++ b/tools/run_tests/sanity/check_submodules.sh
@@ -47,7 +47,6 @@ cat << EOF | awk '{ print $1 }' | sort > $want_submodules
30dbc81fb5ffdc98ea9b14b1918bfe4e8779b26e third_party/gflags (v2.2.0)
ec44c6c1675c25b9827aacd08c02433cccde7780 third_party/googletest (release-1.8.0)
593e917c176b5bc5aafa57bf9f6030d749d91cd5 third_party/protobuf (v3.1.0-alpha-1-326-g593e917)
- bcad91771b7f0bff28a1cac1981d7ef2b9bcef3c third_party/thrift (bcad917)
cacf7f1d4e3d44d871b605da3b647f07d718623f third_party/zlib (v1.2.11)
7691f773af79bf75a62d1863fd0f13ebf9dc51b1 third_party/cares/cares (1.12.0)
EOF