diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-07-22 11:03:31 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-07-22 11:03:31 -0700 |
| commit | 2b7fe5a6c02b0ed73acfad13b1c283872fb65772 (patch) | |
| tree | ca3672f93205395a5feb95975f5e68f3c4d1b426 /tools/distrib/python | |
| parent | 316f73f6c15334575c98255b2feba70d1ec73193 (diff) | |
Actually commit changes to tools/distrib/python/grpcio_tools/setup.py
Diffstat (limited to 'tools/distrib/python')
| -rw-r--r-- | tools/distrib/python/grpcio_tools/setup.py | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/tools/distrib/python/grpcio_tools/setup.py b/tools/distrib/python/grpcio_tools/setup.py index 188fc66191..d49d18e957 100644 --- a/tools/distrib/python/grpcio_tools/setup.py +++ b/tools/distrib/python/grpcio_tools/setup.py @@ -138,7 +138,6 @@ def package_data(): proto_files.append(relative_target) return {GRPC_PYTHON_TOOLS_PACKAGE: proto_files} -<<<<<<< HEAD def extension_modules(): if BUILD_WITH_CYTHON: plugin_sources = ['grpc/tools/_protoc_compiler.pyx'] @@ -152,19 +151,6 @@ def extension_modules(): plugin_ext = extension.Extension( name='grpc.tools._protoc_compiler', sources=plugin_sources, -======= -def protoc_ext_module(): - plugin_sources = [ - os.path.join('grpc', 'tools', 'main.cc'), - os.path.join('grpc_root', 'src', 'compiler', 'python_generator.cc')] + [ - os.path.join(CC_INCLUDE, cc_file) - for cc_file in CC_FILES] - plugin_ext = extension.Extension( - name='grpc.tools._protoc_compiler', - sources=( - [os.path.join('grpc', 'tools', '_protoc_compiler.pyx')] + - plugin_sources), ->>>>>>> upstream/v1.0.x include_dirs=[ '.', 'grpc_root', |