diff options
author | ncteisen <ncteisen@gmail.com> | 2018-03-02 22:09:52 -0800 |
---|---|---|
committer | ncteisen <ncteisen@gmail.com> | 2018-03-02 22:09:52 -0800 |
commit | 94dad67f4386ca1d46d96fd255cf4a9df5c087b2 (patch) | |
tree | 43e29b584e7d8c062d91eee5d0fc50639c1643e4 /src/python | |
parent | c1284576f81efc4b2d9c33c4337d8c9fbafc29de (diff) | |
parent | 6eae794c9f8f305a51274a79400124093ddc9354 (diff) |
Merge branch 'master' of https://github.com/grpc/grpc into channel-tracing
Diffstat (limited to 'src/python')
-rw-r--r-- | src/python/grpcio/grpc_core_dependencies.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 581bc0f011..bf8fb90c5f 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -41,9 +41,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/gpr/sync.cc', 'src/core/lib/gpr/sync_posix.cc', 'src/core/lib/gpr/sync_windows.cc', - 'src/core/lib/gpr/thd.cc', - 'src/core/lib/gpr/thd_posix.cc', - 'src/core/lib/gpr/thd_windows.cc', 'src/core/lib/gpr/time.cc', 'src/core/lib/gpr/time_posix.cc', 'src/core/lib/gpr/time_precise.cc', @@ -53,6 +50,8 @@ CORE_SOURCE_FILES = [ 'src/core/lib/gpr/tmpfile_posix.cc', 'src/core/lib/gpr/tmpfile_windows.cc', 'src/core/lib/gpr/wrap_memcpy.cc', + 'src/core/lib/gprpp/thd_posix.cc', + 'src/core/lib/gprpp/thd_windows.cc', 'src/core/lib/profiling/basic_timers.cc', 'src/core/lib/profiling/stap_timers.cc', 'src/core/lib/surface/init.cc', |