diff options
| author |  Mark D. Roth <roth@google.com> | 2017-10-12 09:13:15 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2017-10-12 09:13:15 -0700 |
| commit | 0e8cad5bba5277d28024b4618067293afd13e92f (patch) | |
| tree | 290afe596661b2201f2820f38e65feec2f1f277f /src/python | |
| parent | 9843ec78a72cced1b304487c8eface166c6fc0a6 (diff) | |
| parent | d7b198be47b5723bc198d25c5ce56f82e12fa97f (diff) | |
Merge remote-tracking branch 'upstream/master' into pick_first_subchannel_list
Diffstat (limited to 'src/python')
| -rw-r--r-- | src/python/grpcio/grpc_core_dependencies.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 68e2753026..c5e4615cad 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -21,7 +21,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/support/arena.cc', 'src/core/lib/support/atm.cc', 'src/core/lib/support/avl.cc', - 'src/core/lib/support/backoff.cc', 'src/core/lib/support/cmdline.cc', 'src/core/lib/support/cpu_iphone.cc', 'src/core/lib/support/cpu_linux.cc', @@ -62,6 +61,7 @@ CORE_SOURCE_FILES = [ 'src/core/lib/support/tmpfile_windows.cc', 'src/core/lib/support/wrap_memcpy.cc', 'src/core/lib/surface/init.cc', + 'src/core/lib/backoff/backoff.cc', 'src/core/lib/channel/channel_args.cc', 'src/core/lib/channel/channel_stack.cc', 'src/core/lib/channel/channel_stack_builder.cc', |