aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar yangg <yangg@google.com>2014-12-17 16:46:06 -0800
committerGravatar Michael Lumish <mlumish@google.com>2014-12-19 13:05:56 -0800
commitfd2f3ac91d6992305522ca3729b6dd527a299e8f (patch)
treea713467cd6c0bab9f79aeb1714ca0b745e351f7e
parentd79b4865ce124d12b2394c2755df8f6539418e93 (diff)
Sync up open source build with []
Change on 2014/12/17 by yangg <yangg@google.com> ------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=82377745
-rw-r--r--Makefile2
-rw-r--r--build.json2
2 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index a1b8c38711..b42ab57cee 100644
--- a/Makefile
+++ b/Makefile
@@ -1066,6 +1066,7 @@ LIBGRPC++_SRC = \
src/cpp/server/async_server_context.cc \
src/cpp/server/completion_queue.cc \
src/cpp/server/server_builder.cc \
+ src/cpp/server/server_context_impl.cc \
src/cpp/server/server.cc \
src/cpp/server/server_rpc_handler.cc \
src/cpp/server/server_credentials.cc \
@@ -1084,6 +1085,7 @@ PUBLIC_HEADERS_CXX += \
include/grpc++/create_channel.h \
include/grpc++/credentials.h \
include/grpc++/server_builder.h \
+ include/grpc++/server_context.h \
include/grpc++/server_credentials.h \
include/grpc++/server.h \
include/grpc++/status.h \
diff --git a/build.json b/build.json
index a97017208b..64a1df266b 100644
--- a/build.json
+++ b/build.json
@@ -314,6 +314,7 @@
"src/cpp/server/async_server_context.cc",
"src/cpp/server/completion_queue.cc",
"src/cpp/server/server_builder.cc",
+ "src/cpp/server/server_context_impl.cc",
"src/cpp/server/server.cc",
"src/cpp/server/server_rpc_handler.cc",
"src/cpp/server/server_credentials.cc",
@@ -332,6 +333,7 @@
"include/grpc++/create_channel.h",
"include/grpc++/credentials.h",
"include/grpc++/server_builder.h",
+ "include/grpc++/server_context.h",
"include/grpc++/server_credentials.h",
"include/grpc++/server.h",
"include/grpc++/status.h",