diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-01 07:42:20 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-01 07:42:20 -0700 |
| commit | 5f95f1a4caff51459b77b0d6890e396e16617b9e (patch) | |
| tree | 282c7e47f5a5f1a62964a47473c51472f7df995c /src/python | |
| parent | d35bb9ec62992cb01f44316a7267d39f1918149d (diff) | |
| parent | bd210c0bff6c8e52f49caa1cbc129359c24e2fbf (diff) | |
Merge github.com:grpc/grpc into cpparena
Diffstat (limited to 'src/python')
| -rw-r--r-- | src/python/grpcio/grpc_core_dependencies.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 970c70bb1b..ed8793b019 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -88,6 +88,7 @@ CORE_SOURCE_FILES = [ 'src/core/lib/channel/handshaker_registry.c', 'src/core/lib/channel/http_client_filter.c', 'src/core/lib/channel/http_server_filter.c', + 'src/core/lib/channel/max_age_filter.c', 'src/core/lib/channel/message_size_filter.c', 'src/core/lib/compression/compression.c', 'src/core/lib/compression/message_compress.c', @@ -162,7 +163,7 @@ CORE_SOURCE_FILES = [ 'src/core/lib/json/json_reader.c', 'src/core/lib/json/json_string.c', 'src/core/lib/json/json_writer.c', - 'src/core/lib/security/util/b64.c', + 'src/core/lib/slice/b64.c', 'src/core/lib/slice/percent_encoding.c', 'src/core/lib/slice/slice.c', 'src/core/lib/slice/slice_buffer.c', |