diff options
| author |  Yuchen Zeng <zyc@google.com> | 2017-06-06 13:26:36 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2017-06-06 13:26:36 -0700 |
| commit | b89b5011ecfe5135e03e98fb058e0ad345747007 (patch) | |
| tree | c49d57c3c752150148840b672474ccfeb81d6294 /build.yaml | |
| parent | 4ebace71b071d9dd38a089c88b737b52fe57dfd5 (diff) | |
| parent | b1332047d049d788a59284a561f4d6c2c2488792 (diff) | |
Merge remote-tracking branch 'upstream/master' into srv_record
Diffstat (limited to 'build.yaml')
| -rw-r--r-- | build.yaml | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/build.yaml b/build.yaml index 2a0bdd1ddb..76715fc85e 100644 --- a/build.yaml +++ b/build.yaml @@ -14,7 +14,7 @@ settings: '#10': See the expand_version.py for all the quirks here core_version: 4.0.0-dev g_stands_for: gregarious - version: 1.4.0-dev + version: 1.5.0-dev filegroups: - name: census public_headers: @@ -27,6 +27,8 @@ filegroups: - src/core/ext/census/gen/census.pb.h - src/core/ext/census/gen/trace_context.pb.h - src/core/ext/census/grpc_filter.h + - src/core/ext/census/intrusive_hash_map.h + - src/core/ext/census/intrusive_hash_map_internal.h - src/core/ext/census/mlog.h - src/core/ext/census/resource.h - src/core/ext/census/rpc_metric_id.h @@ -45,6 +47,7 @@ filegroups: - src/core/ext/census/grpc_filter.c - src/core/ext/census/grpc_plugin.c - src/core/ext/census/initialize.c + - src/core/ext/census/intrusive_hash_map.c - src/core/ext/census/mlog.c - src/core/ext/census/operation.c - src/core/ext/census/placeholders.c @@ -961,9 +964,10 @@ filegroups: - src/cpp/util/status.cc - src/cpp/util/string_ref.cc - src/cpp/util/time_cc.cc + deps: + - grpc uses: - grpc++_codegen_base - - grpc_base - nanopb - name: grpc++_codegen_base language: c++ @@ -1676,6 +1680,16 @@ targets: - grpc - gpr_test_util - gpr +- name: census_intrusive_hash_map_test + build: test + language: c + src: + - test/core/census/intrusive_hash_map_test.c + deps: + - grpc_test_util + - grpc + - gpr_test_util + - gpr - name: census_resource_test build: test language: c @@ -2694,6 +2708,18 @@ targets: - grpc - gpr_test_util - gpr +- name: num_external_connectivity_watchers_test + build: test + language: c + src: + - test/core/surface/num_external_connectivity_watchers_test.c + deps: + - grpc_test_util + - grpc + - gpr_test_util + - gpr + exclude_iomgrs: + - uv - name: parse_address_test build: test language: c @@ -4630,6 +4656,7 @@ php_config_m4: - grpc - gpr - boringssl + - z headers: - src/php/ext/grpc/byte_buffer.h - src/php/ext/grpc/call.h |