diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-04-30 13:32:20 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-04-30 13:32:20 -0700 |
| commit | 12c4d4e4a389b15dc12b8b87d4f1fe5964014a85 (patch) | |
| tree | 3c6bcc73a4483af1c26b6565c922db43c5ef192b /BUILD | |
| parent | 624d43015adea4762f9cdab8836f07e80ecf1c65 (diff) | |
| parent | 71c77bebea85457c94d2411cb6c71e6da498c3db (diff) | |
Merge branch 'one-read' into swappy
Diffstat (limited to 'BUILD')
| -rw-r--r-- | BUILD | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -296,7 +296,8 @@ 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/profiling/basic_timers.c", + "src/core/profiling/stap_timers.c", "src/core/statistics/census_init.c", "src/core/statistics/census_log.c", "src/core/statistics/census_rpc_stats.c", @@ -503,7 +504,8 @@ 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/profiling/basic_timers.c", + "src/core/profiling/stap_timers.c", "src/core/statistics/census_init.c", "src/core/statistics/census_log.c", "src/core/statistics/census_rpc_stats.c", |