diff options
| author |  Yang Gao <yangg@google.com> | 2015-04-15 11:38:24 -0700 |
|---|---|---|
| committer | Yang Gao <yangg@google.com> | 2015-04-15 11:38:24 -0700 |
| commit | 0f5621d13137085703085a81e241f47f95d95d1d (patch) | |
| tree | 5fbbaf6467db7c1d40895f22253fac947ca77b3e /BUILD | |
| parent | 084ef5267213b6b87e913ec5e9af738fde016c8f (diff) | |
| parent | db38bb1d824833a509facbe76a0a8b4d25add99b (diff) | |
sync and resolve conflict
Diffstat (limited to 'BUILD')
| -rw-r--r-- | BUILD | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -186,6 +186,8 @@ cc_library( "src/core/json/json_common.h", "src/core/json/json_reader.h", "src/core/json/json_writer.h", + "src/core/profiling/timers.h", + "src/core/profiling/timers_preciseclock.h", "src/core/statistics/census_interface.h", "src/core/statistics/census_log.h", "src/core/statistics/census_rpc_stats.h", @@ -265,6 +267,7 @@ cc_library( "src/core/iomgr/alarm_heap.c", "src/core/iomgr/endpoint.c", "src/core/iomgr/endpoint_pair_posix.c", + "src/core/iomgr/endpoint_pair_windows.c", "src/core/iomgr/fd_posix.c", "src/core/iomgr/iocp_windows.c", "src/core/iomgr/iomgr.c", @@ -297,6 +300,7 @@ cc_library( "src/core/json/json_reader.c", "src/core/json/json_string.c", "src/core/json/json_writer.c", + "src/core/profiling/timers.c", "src/core/statistics/census_init.c", "src/core/statistics/census_log.c", "src/core/statistics/census_rpc_stats.c", @@ -413,6 +417,8 @@ cc_library( "src/core/json/json_common.h", "src/core/json/json_reader.h", "src/core/json/json_writer.h", + "src/core/profiling/timers.h", + "src/core/profiling/timers_preciseclock.h", "src/core/statistics/census_interface.h", "src/core/statistics/census_log.h", "src/core/statistics/census_rpc_stats.h", @@ -472,6 +478,7 @@ cc_library( "src/core/iomgr/alarm_heap.c", "src/core/iomgr/endpoint.c", "src/core/iomgr/endpoint_pair_posix.c", + "src/core/iomgr/endpoint_pair_windows.c", "src/core/iomgr/fd_posix.c", "src/core/iomgr/iocp_windows.c", "src/core/iomgr/iomgr.c", @@ -504,6 +511,7 @@ cc_library( "src/core/json/json_reader.c", "src/core/json/json_string.c", "src/core/json/json_writer.c", + "src/core/profiling/timers.c", "src/core/statistics/census_init.c", "src/core/statistics/census_log.c", "src/core/statistics/census_rpc_stats.c", |