diff options
| author |  David G. Quintas <dgq@google.com> | 2018-06-14 17:32:26 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-06-14 17:32:26 -0700 |
| commit | 1c6d6ba851b6d65ce8757b468b21b0235f9b5312 (patch) | |
| tree | e80ced672e2bae9a8c24fb1a591e6d8d0f42f5e8 /src/core/ext/filters | |
| parent | 5bc31dbd42f2ed4f1aa1bba9548b1b87f286792c (diff) | |
| parent | 39fbed3589aa0e240acfcbe4b04971c0f9472a21 (diff) | |
Merge pull request #15595 from dgquintas/nanopb_build_cleanup
Treat nanopb as a regular external dep
Diffstat (limited to 'src/core/ext/filters')
| -rw-r--r-- | src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc | 4 | ||||
| -rw-r--r-- | src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc index ed246273c9..c854e7a9cf 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc @@ -18,9 +18,9 @@ #include <grpc/support/port_platform.h> +#include "pb_decode.h" +#include "pb_encode.h" #include "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h" -#include "third_party/nanopb/pb_decode.h" -#include "third_party/nanopb/pb_encode.h" #include <grpc/support/alloc.h> diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h b/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h index 066c076202..088b6f513a 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h @@ -3,7 +3,7 @@ #ifndef PB_GRPC_LB_V1_LOAD_BALANCER_PB_H_INCLUDED #define PB_GRPC_LB_V1_LOAD_BALANCER_PB_H_INCLUDED -#include "third_party/nanopb/pb.h" +#include "pb.h" /* @@protoc_insertion_point(includes) */ #if PB_PROTO_HEADER_VERSION != 30 #error Regenerate this file with the current version of nanopb generator. |