diff options
author | David Garcia Quintas <dgq@google.com> | 2015-10-13 16:17:26 -0700 |
---|---|---|
committer | David Garcia Quintas <dgq@google.com> | 2015-10-13 16:17:26 -0700 |
commit | 0fe72429a03dd1ac6081ee8efe8fe7b85da7bef3 (patch) | |
tree | e18efd405fce4cb017105fedf9e1cef5585824e0 /build.yaml | |
parent | 7b1bd2c2713c9d505094ab728a08d4c94f15c6fa (diff) | |
parent | bee8f104c0827bc829402d79c8302835adfc37f9 (diff) |
Merge branch 'master' of github.com:grpc/grpc into microchannels
Diffstat (limited to 'build.yaml')
-rw-r--r-- | build.yaml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/build.yaml b/build.yaml index d14ac0c089..a968f1799e 100644 --- a/build.yaml +++ b/build.yaml @@ -178,12 +178,12 @@ filegroups: - 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/statistics/census_interface.h - src/core/statistics/census_rpc_stats.h - src/core/surface/api_trace.h - src/core/surface/byte_buffer_queue.h - src/core/surface/call.h + - src/core/surface/call_test_only.h - src/core/surface/channel.h - src/core/surface/completion_queue.h - src/core/surface/event_string.h @@ -294,8 +294,6 @@ filegroups: - src/core/json/json_reader.c - src/core/json/json_string.c - src/core/json/json_writer.c - - src/core/profiling/basic_timers.c - - src/core/profiling/stap_timers.c - src/core/surface/api_trace.c - src/core/surface/byte_buffer.c - src/core/surface/byte_buffer_queue.c @@ -394,6 +392,7 @@ libs: - include/grpc/support/tls_pthread.h - include/grpc/support/useful.h headers: + - src/core/profiling/timers.h - src/core/support/block_annotate.h - src/core/support/env.h - src/core/support/file.h @@ -404,6 +403,8 @@ libs: - src/core/support/thd_internal.h - src/core/support/time_precise.h src: + - src/core/profiling/basic_timers.c + - src/core/profiling/stap_timers.c - src/core/support/alloc.c - src/core/support/cmdline.c - src/core/support/cpu_iphone.c @@ -439,6 +440,7 @@ libs: - src/core/support/thd_win32.c - src/core/support/time.c - src/core/support/time_posix.c + - src/core/support/time_precise.c - src/core/support/time_win32.c - src/core/support/tls_pthread.c secure: false |