grpc
/
grpc-web
mirror of https://github.com/grpc/grpc-web.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change gRPC-Web make file to add the protobuf include directory.

This commit is contained in:
Feng Li 2017-11-13 14:16:04 -08:00
parent e64c2779be
commit 24ff395bb4
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -2,6 +2,7 @@ OS := $(shell uname)
CC := g++ CC := g++
ROOT_DIR := $(shell pwd) ROOT_DIR := $(shell pwd)
GRPC_GATEWAY_PROTOS := $(ROOT_DIR)/net/grpc/gateway/protos GRPC_GATEWAY_PROTOS := $(ROOT_DIR)/net/grpc/gateway/protos
PROTO_INC := $(ROOT_DIR)/third_party/grpc/third_party/protobuf/include
PROTO_SRC := $(ROOT_DIR)/third_party/grpc/third_party/protobuf/src PROTO_SRC := $(ROOT_DIR)/third_party/grpc/third_party/protobuf/src
PROTO_LIB := $(PROTO_SRC)/.libs PROTO_LIB := $(PROTO_SRC)/.libs
PROTOC := $(PROTO_SRC)/protoc PROTOC := $(PROTO_SRC)/protoc
@ -41,7 +42,7 @@ nginx_config:
auto/configure \ auto/configure \
--with-http_ssl_module \ --with-http_ssl_module \
--with-http_v2_module \ --with-http_v2_module \
--with-cc-opt="-I /usr/local/include -I $(ROOT_DIR) -I $(PROTO_SRC) \ --with-cc-opt="-I /usr/local/include -I $(ROOT_DIR) -I $(PROTO_INC) -I $(PROTO_SRC) \
-I $(GRPC_INC) -I $(GRPC_SRC)" \ -I $(GRPC_INC) -I $(GRPC_SRC)" \
--with-ld-opt="$(NGINX_LD_OPT)" \ --with-ld-opt="$(NGINX_LD_OPT)" \
--with-openssl="$(ROOT_DIR)/third_party/openssl" \ --with-openssl="$(ROOT_DIR)/third_party/openssl" \
@ -52,7 +53,7 @@ nginx_config_static:
auto/configure \ auto/configure \
--with-http_ssl_module \ --with-http_ssl_module \
--with-http_v2_module \ --with-http_v2_module \
--with-cc-opt="-I /usr/local/include -I $(ROOT_DIR) -I $(PROTO_SRC) \ --with-cc-opt="-I /usr/local/include -I $(ROOT_DIR) -I $(PROTO_INC) -I $(PROTO_SRC) \
-I $(GRPC_INC) -I $(GRPC_SRC)" \ -I $(GRPC_INC) -I $(GRPC_SRC)" \
--with-ld-opt="$(NGINX_STATIC_LD_OPT)" \ --with-ld-opt="$(NGINX_STATIC_LD_OPT)" \
--with-openssl="$(ROOT_DIR)/third_party/openssl" \ --with-openssl="$(ROOT_DIR)/third_party/openssl" \

2
net/grpc/gateway/runtime/runtime.cc
View File

@ -4,6 +4,7 @@
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
#include "google/protobuf/stubs/common.h"
#include "net/grpc/gateway/backend/grpc_backend.h" #include "net/grpc/gateway/backend/grpc_backend.h"
#include "net/grpc/gateway/codec/b64_proto_decoder.h" #include "net/grpc/gateway/codec/b64_proto_decoder.h"
#include "net/grpc/gateway/codec/b64_proto_encoder.h" #include "net/grpc/gateway/codec/b64_proto_encoder.h"
@ -23,7 +24,6 @@
#include "net/grpc/gateway/runtime/constants.h" #include "net/grpc/gateway/runtime/constants.h"
#include "third_party/grpc/include/grpc++/support/config.h" #include "third_party/grpc/include/grpc++/support/config.h"
#include "third_party/grpc/include/grpc/grpc.h" #include "third_party/grpc/include/grpc/grpc.h"
#include "third_party/protobuf/include/google/protobuf/stubs/common.h"
namespace grpc { namespace grpc {
namespace gateway { namespace gateway {