diff options
| author |  murgatroid99 <mlumish@google.com> | 2017-06-15 17:48:42 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2017-06-15 17:48:42 -0700 |
| commit | d5b0455110b834c7fa102a0338882a4f98d31ae8 (patch) | |
| tree | dcc9789852f362a5986709587475aee4822cd350 /BUILD | |
| parent | fb5ad8d2b9b5fc541a3a85703783fe8e7e4ee91b (diff) | |
| parent | 2f850801235580217bb74c5911686bce0374dcad (diff) | |
Merge remote-tracking branch 'upstream/v1.4.x' into upmerge_1.4.x
Diffstat (limited to 'BUILD')
| -rw-r--r-- | BUILD | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -930,8 +930,8 @@ grpc_cc_library( deps = [ "grpc_base", "grpc_client_channel", - "grpc_secure", "grpc_resolver_fake", + "grpc_secure", ], ) @@ -1025,8 +1025,8 @@ grpc_cc_library( name = "grpc_resolver_fake", srcs = ["src/core/ext/filters/client_channel/resolver/fake/fake_resolver.c"], hdrs = ["src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h"], - visibility = ["//test:__subpackages__"], language = "c", + visibility = ["//test:__subpackages__"], deps = [ "grpc_base", "grpc_client_channel", |