aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2017-03-01 16:00:19 -0800
committerGravatar Craig Tiller <ctiller@google.com>2017-03-01 16:00:19 -0800
commit36281f950a30de08fc0b651a0a08af1d84074fe1 (patch)
tree84e972f264afa16a6f30d1b3d428163081ac3bee /Makefile
parentf9abb2921b4e7808af4ab0dc8681d9435705aad9 (diff)
parentfbedd676f7207fc9ebb2586999fc14908b779471 (diff)
Merge github.com:grpc/grpc into lto
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 2 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index f29f015a6f..3a21854a1e 100644
--- a/Makefile
+++ b/Makefile
@@ -3329,10 +3329,8 @@ LIBGRPC_TEST_UTIL_SRC = \
test/core/util/mock_endpoint.c \
test/core/util/parse_hexstring.c \
test/core/util/passthru_endpoint.c \
- test/core/util/port_posix.c \
+ test/core/util/port.c \
test/core/util/port_server_client.c \
- test/core/util/port_uv.c \
- test/core/util/port_windows.c \
test/core/util/slice_splitter.c \
test/core/util/trickle_endpoint.c \
src/core/lib/channel/channel_args.c \
@@ -3531,10 +3529,8 @@ LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
test/core/util/mock_endpoint.c \
test/core/util/parse_hexstring.c \
test/core/util/passthru_endpoint.c \
- test/core/util/port_posix.c \
+ test/core/util/port.c \
test/core/util/port_server_client.c \
- test/core/util/port_uv.c \
- test/core/util/port_windows.c \
test/core/util/slice_splitter.c \
test/core/util/trickle_endpoint.c \