diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-10-05 11:17:15 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-10-05 11:17:15 -0700 |
| commit | 50f473e2ffed9cbe8ee3ad5e5a9b345990b8c618 (patch) | |
| tree | 6660262ccb66312e081201e4be7f6462df5c05b7 | |
| parent | e1a2b4ad59892daf7c84d9118a133724ccb034ad (diff) | |
Fix merge
| -rw-r--r-- | BUILD | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -513,7 +513,6 @@ grpc_cc_library( "src/core/lib/support/atomic.h", "src/core/lib/support/atomic_with_atm.h", "src/core/lib/support/atomic_with_std.h", - "src/core/lib/iomgr/block_annotate.h", "src/core/lib/support/env.h", "src/core/lib/support/memory.h", "src/core/lib/support/mpscq.h", @@ -761,6 +760,7 @@ grpc_cc_library( "src/core/lib/iomgr/socket_utils_posix.h", "src/core/lib/iomgr/socket_windows.h", "src/core/lib/iomgr/sys_epoll_wrapper.h", + "src/core/lib/iomgr/block_annotate.h", "src/core/lib/iomgr/tcp_client.h", "src/core/lib/iomgr/tcp_client_posix.h", "src/core/lib/iomgr/tcp_posix.h", |