diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-06-23 16:26:18 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-06-23 16:26:18 -0700 |
| commit | 009886cf79bd4bf53049633ef7797eb63be30b68 (patch) | |
| tree | acf2de7539d7b49cb35f174c25100a4d6b644d23 /BUILD | |
| parent | af691804781f4e546c806b98ca8b05e2370e61f8 (diff) | |
| parent | 6b4fc31f08b9a61a90262379072cffea0bc39795 (diff) | |
Merge github.com:grpc/grpc into that-which-we-call-a-rose
Conflicts:
gRPC.podspec
tools/doxygen/Doxyfile.core.internal
Diffstat (limited to 'BUILD')
| -rw-r--r-- | BUILD | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -2,6 +2,8 @@ # This currently builds C and C++ code. # This file has been automatically generated from a template file. # Please look at the templates directory instead. +# This file can be regenerated from the template by running +# tools/buildgen/generate_projects.sh # Copyright 2015, Google Inc. # All rights reserved. @@ -176,6 +178,7 @@ cc_library( "src/core/iomgr/pollset.h", "src/core/iomgr/pollset_kick_posix.h", "src/core/iomgr/pollset_posix.h", + "src/core/iomgr/pollset_set.h", "src/core/iomgr/pollset_set_posix.h", "src/core/iomgr/pollset_set_windows.h", "src/core/iomgr/pollset_windows.h", @@ -411,6 +414,7 @@ cc_library( "src/core/iomgr/pollset.h", "src/core/iomgr/pollset_kick_posix.h", "src/core/iomgr/pollset_posix.h", + "src/core/iomgr/pollset_set.h", "src/core/iomgr/pollset_set_posix.h", "src/core/iomgr/pollset_set_windows.h", "src/core/iomgr/pollset_windows.h", @@ -593,14 +597,12 @@ cc_library( "src/cpp/client/secure_credentials.h", "src/cpp/server/secure_server_credentials.h", "src/cpp/client/channel.h", - "src/cpp/proto/proto_utils.h", "src/cpp/server/thread_pool.h", "src/cpp/client/secure_credentials.cc", "src/cpp/server/secure_server_credentials.cc", "src/cpp/client/channel.cc", "src/cpp/client/channel_arguments.cc", "src/cpp/client/client_context.cc", - "src/cpp/client/client_unary_call.cc", "src/cpp/client/create_channel.cc", "src/cpp/client/credentials.cc", "src/cpp/client/generic_stub.cc", @@ -632,6 +634,7 @@ cc_library( "include/grpc++/client_context.h", "include/grpc++/completion_queue.h", "include/grpc++/config.h", + "include/grpc++/config_protobuf.h", "include/grpc++/create_channel.h", "include/grpc++/credentials.h", "include/grpc++/generic_stub.h", @@ -639,8 +642,10 @@ cc_library( "include/grpc++/impl/client_unary_call.h", "include/grpc++/impl/grpc_library.h", "include/grpc++/impl/internal_stub.h", + "include/grpc++/impl/proto_utils.h", "include/grpc++/impl/rpc_method.h", "include/grpc++/impl/rpc_service_method.h", + "include/grpc++/impl/serialization_traits.h", "include/grpc++/impl/service_type.h", "include/grpc++/impl/sync.h", "include/grpc++/impl/sync_cxx11.h", @@ -675,12 +680,10 @@ cc_library( name = "grpc++_unsecure", srcs = [ "src/cpp/client/channel.h", - "src/cpp/proto/proto_utils.h", "src/cpp/server/thread_pool.h", "src/cpp/client/channel.cc", "src/cpp/client/channel_arguments.cc", "src/cpp/client/client_context.cc", - "src/cpp/client/client_unary_call.cc", "src/cpp/client/create_channel.cc", "src/cpp/client/credentials.cc", "src/cpp/client/generic_stub.cc", @@ -712,6 +715,7 @@ cc_library( "include/grpc++/client_context.h", "include/grpc++/completion_queue.h", "include/grpc++/config.h", + "include/grpc++/config_protobuf.h", "include/grpc++/create_channel.h", "include/grpc++/credentials.h", "include/grpc++/generic_stub.h", @@ -719,8 +723,10 @@ cc_library( "include/grpc++/impl/client_unary_call.h", "include/grpc++/impl/grpc_library.h", "include/grpc++/impl/internal_stub.h", + "include/grpc++/impl/proto_utils.h", "include/grpc++/impl/rpc_method.h", "include/grpc++/impl/rpc_service_method.h", + "include/grpc++/impl/serialization_traits.h", "include/grpc++/impl/service_type.h", "include/grpc++/impl/sync.h", "include/grpc++/impl/sync_cxx11.h", |