diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2016-04-27 16:43:42 -0700 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2016-04-27 16:43:42 -0700 |
| commit | 192afb9a31d52d9a3bcd0984915377d331e04859 (patch) | |
| tree | a43c22e8460bbaddafbbd34e77d3b2598eaa6791 /src/python | |
| parent | cfa64013286a3dc9f96ef67b6c4b900057675768 (diff) | |
| parent | 165c62ff7562d3fb9f9f8afd0b431c7b5fab97e1 (diff) | |
Merge remote-tracking branch 'upstream/master' into server_channel_affinity
Diffstat (limited to 'src/python')
| -rw-r--r-- | src/python/grpcio/grpc_core_dependencies.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index c5a0a398b4..dab62530aa 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -57,6 +57,7 @@ CORE_SOURCE_FILES = [ 'src/core/lib/support/stack_lockfree.c', 'src/core/lib/support/string.c', 'src/core/lib/support/string_posix.c', + 'src/core/lib/support/string_util_win32.c', 'src/core/lib/support/string_win32.c', 'src/core/lib/support/subprocess_posix.c', 'src/core/lib/support/subprocess_windows.c', @@ -71,6 +72,7 @@ CORE_SOURCE_FILES = [ 'src/core/lib/support/time_precise.c', 'src/core/lib/support/time_win32.c', 'src/core/lib/support/tls_pthread.c', + 'src/core/lib/support/tmpfile_msys.c', 'src/core/lib/support/tmpfile_posix.c', 'src/core/lib/support/tmpfile_win32.c', 'src/core/lib/support/wrap_memcpy.c', |