aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/python
diff options
context:
space:
mode:
authorGravatar jiangtaoli2016 <jiangtao@google.com>2017-04-11 10:07:01 -0700
committerGravatar jiangtaoli2016 <jiangtao@google.com>2017-04-11 10:07:01 -0700
commit70928f0722b20343dc86ca2d8c76683f78e69e4b (patch)
treec1114a4c4340a0ff9e4610405d1a2b3da840dee1 /src/python
parent27f97b9d2eed91b4e4b70a0b909976ac2680b822 (diff)
parente3683cadd3a22d138e97c68af84a1680f80b8a4a (diff)
Merge branch 'master' into new_tsi
Diffstat (limited to 'src/python')
-rw-r--r--src/python/grpcio/grpc_core_dependencies.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index 88e783815c..9c3fc55a0a 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -113,6 +113,7 @@ CORE_SOURCE_FILES = [
'src/core/lib/iomgr/iomgr_uv.c',
'src/core/lib/iomgr/iomgr_windows.c',
'src/core/lib/iomgr/load_file.c',
+ 'src/core/lib/iomgr/lockfree_event.c',
'src/core/lib/iomgr/network_status_tracker.c',
'src/core/lib/iomgr/polling_entity.c',
'src/core/lib/iomgr/pollset_set_uv.c',