back to using quotes for nanopb includes

pull/15595/head
David Garcia Quintas 7 years ago
parent fdf6a302d1
commit bc9573d7ac
  1. 4
      src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
  2. 2
      src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h
  3. 4
      src/core/tsi/alts/handshaker/alts_handshaker_service_api_util.h
  4. 2
      src/core/tsi/alts/handshaker/altscontext.pb.h
  5. 2
      src/core/tsi/alts/handshaker/handshaker.pb.h
  6. 2
      src/core/tsi/alts/handshaker/transport_security_common.pb.h
  7. 4
      src/core/tsi/alts/handshaker/transport_security_common_api.h
  8. 4
      src/cpp/server/health/default_health_check_service.cc
  9. 2
      src/cpp/server/health/health.pb.h
  10. 2
      tools/codegen/core/gen_nano_proto.sh

@ -18,8 +18,8 @@
#include <grpc/support/port_platform.h>
#include <pb_decode.h>
#include <pb_encode.h>
#include "pb_decode.h"
#include "pb_encode.h"
#include "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h"
#include <grpc/support/alloc.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 <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.

@ -21,8 +21,8 @@
#include <grpc/support/port_platform.h>
#include <pb_decode.h>
#include <pb_encode.h>
#include "pb_decode.h"
#include "pb_encode.h"
#include <grpc/slice.h>
#include <grpc/slice_buffer.h>

@ -3,7 +3,7 @@
#ifndef PB_GRPC_GCP_ALTSCONTEXT_PB_H_INCLUDED
#define PB_GRPC_GCP_ALTSCONTEXT_PB_H_INCLUDED
#include <pb.h>
#include "pb.h"
#include "src/core/tsi/alts/handshaker/transport_security_common.pb.h"
/* @@protoc_insertion_point(includes) */

@ -3,7 +3,7 @@
#ifndef PB_GRPC_GCP_HANDSHAKER_PB_H_INCLUDED
#define PB_GRPC_GCP_HANDSHAKER_PB_H_INCLUDED
#include <pb.h>
#include "pb.h"
#include "src/core/tsi/alts/handshaker/transport_security_common.pb.h"
/* @@protoc_insertion_point(includes) */

@ -3,7 +3,7 @@
#ifndef PB_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PB_H_INCLUDED
#define PB_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PB_H_INCLUDED
#include <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.

@ -21,8 +21,8 @@
#include <grpc/support/port_platform.h>
#include <pb_decode.h>
#include <pb_encode.h>
#include "pb_decode.h"
#include "pb_encode.h"
#include <grpc/slice.h>
#include <grpc/slice_buffer.h>

@ -24,8 +24,8 @@
#include <grpc/support/log.h>
#include <grpcpp/impl/codegen/method_handler_impl.h>
#include <pb_decode.h>
#include <pb_encode.h>
#include "pb_decode.h"
#include "pb_encode.h"
#include "src/cpp/server/health/default_health_check_service.h"
#include "src/cpp/server/health/health.pb.h"

@ -3,7 +3,7 @@
#ifndef PB_GRPC_HEALTH_V1_HEALTH_PB_H_INCLUDED
#define PB_GRPC_HEALTH_V1_HEALTH_PB_H_INCLUDED
#include <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.

@ -74,7 +74,7 @@ pushd "$(dirname $INPUT_PROTO)" > /dev/null
protoc \
--plugin=protoc-gen-nanopb="$GRPC_ROOT/third_party/nanopb/generator/protoc-gen-nanopb" \
--nanopb_out='-T -L#include\ \<pb.h\>'":$OUTPUT_DIR" "$(basename $INPUT_PROTO)"
--nanopb_out='-T -L#include\ \"pb.h\"'":$OUTPUT_DIR" "$(basename $INPUT_PROTO)"
readonly PROTO_BASENAME=$(basename $INPUT_PROTO .proto)
sed -i "s:$PROTO_BASENAME.pb.h:${GRPC_OUTPUT_DIR}/$PROTO_BASENAME.pb.h:g" \

Loading…
Cancel
Save