diff options
author | Craig Tiller <ctiller@google.com> | 2017-05-01 15:35:56 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2017-05-01 15:35:56 -0700 |
commit | d4ee77e7410cee755c36fbd78b8f2f0198da67d9 (patch) | |
tree | bde2feec2c12586fe23e0be693b3cd2474acd6d4 /Makefile | |
parent | c610985aeb3931c53726e742707aa1a8b2fe84b9 (diff) | |
parent | 305dcf3d32bed0614325ead76f121702768ce874 (diff) |
Merge github.com:grpc/grpc into epex4
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -5176,8 +5176,6 @@ PUBLIC_HEADERS_CXX += \ include/grpc/impl/codegen/sync_windows.h \ include/grpc++/impl/codegen/proto_utils.h \ include/grpc++/impl/codegen/config_protobuf.h \ - include/grpc++/impl/codegen/thrift_serializer.h \ - include/grpc++/impl/codegen/thrift_utils.h \ LIBGRPC++_TEST_UTIL_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC++_TEST_UTIL_SRC)))) |