fixed faulty merge
diff --git a/build.yaml b/build.yaml
index 9fd667d..ca343cf 100644
--- a/build.yaml
+++ b/build.yaml
@@ -137,9 +137,6 @@
- src/core/httpcli/format_request.h
- src/core/httpcli/httpcli.h
- src/core/httpcli/parser.h
- - src/core/iomgr/alarm.h
- - src/core/iomgr/alarm_heap.h
- - src/core/iomgr/alarm_internal.h
- src/core/iomgr/closure.h
- src/core/iomgr/endpoint.h
- src/core/iomgr/endpoint_pair.h
@@ -167,6 +164,9 @@
- src/core/iomgr/tcp_server.h
- src/core/iomgr/tcp_windows.h
- src/core/iomgr/time_averaged_stats.h
+ - src/core/iomgr/timer.h
+ - src/core/iomgr/timer_heap.h
+ - src/core/iomgr/timer_internal.h
- src/core/iomgr/udp_server.h
- src/core/iomgr/wakeup_fd_pipe.h
- src/core/iomgr/wakeup_fd_posix.h
@@ -249,8 +249,6 @@
- src/core/httpcli/format_request.c
- src/core/httpcli/httpcli.c
- src/core/httpcli/parser.c
- - src/core/iomgr/alarm.c
- - src/core/iomgr/alarm_heap.c
- src/core/iomgr/closure.c
- src/core/iomgr/endpoint.c
- src/core/iomgr/endpoint_pair_posix.c
@@ -281,6 +279,8 @@
- src/core/iomgr/tcp_server_windows.c
- src/core/iomgr/tcp_windows.c
- src/core/iomgr/time_averaged_stats.c
+ - src/core/iomgr/timer.c
+ - src/core/iomgr/timer_heap.c
- src/core/iomgr/udp_server.c
- src/core/iomgr/wakeup_fd_eventfd.c
- src/core/iomgr/wakeup_fd_nospecial.c
@@ -783,26 +783,6 @@
- winsock
- global
targets:
-- name: alarm_heap_test
- build: test
- language: c
- src:
- - test/core/iomgr/alarm_heap_test.c
- deps:
- - grpc_test_util
- - grpc
- - gpr_test_util
- - gpr
-- name: alarm_list_test
- build: test
- language: c
- src:
- - test/core/iomgr/alarm_list_test.c
- deps:
- - grpc_test_util
- - grpc
- - gpr_test_util
- - gpr
- name: alpn_test
build: test
language: c
@@ -1510,6 +1490,26 @@
- grpc
- gpr_test_util
- gpr
+- name: timer_heap_test
+ build: test
+ language: c
+ src:
+ - test/core/iomgr/timer_heap_test.c
+ deps:
+ - grpc_test_util
+ - grpc
+ - gpr_test_util
+ - gpr
+- name: timer_list_test
+ build: test
+ language: c
+ src:
+ - test/core/iomgr/timer_list_test.c
+ deps:
+ - grpc_test_util
+ - grpc
+ - gpr_test_util
+ - gpr
- name: timers_test
build: test
language: c