Fix merge

7 years ago · 50f473e2ff
parent e1a2b4ad59
commit 50f473e2ff
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -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",