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 /grpc.gemspec | |
| parent | c1284576f81efc4b2d9c33c4337d8c9fbafc29de (diff) | |
| parent | 6eae794c9f8f305a51274a79400124093ddc9354 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into channel-tracing
Diffstat (limited to 'grpc.gemspec')
| -rw-r--r-- | grpc.gemspec | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/grpc.gemspec b/grpc.gemspec index 507c5e342f..d33333ace9 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -83,7 +83,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/gpr/spinlock.h ) s.files += %w( src/core/lib/gpr/string.h ) s.files += %w( src/core/lib/gpr/string_windows.h ) - s.files += %w( src/core/lib/gpr/thd.h ) s.files += %w( src/core/lib/gpr/time_precise.h ) s.files += %w( src/core/lib/gpr/tls.h ) s.files += %w( src/core/lib/gpr/tls_gcc.h ) @@ -97,6 +96,7 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/gprpp/atomic_with_std.h ) s.files += %w( src/core/lib/gprpp/manual_constructor.h ) s.files += %w( src/core/lib/gprpp/memory.h ) + s.files += %w( src/core/lib/gprpp/thd.h ) s.files += %w( src/core/lib/profiling/timers.h ) s.files += %w( src/core/lib/gpr/alloc.cc ) s.files += %w( src/core/lib/gpr/arena.cc ) @@ -124,9 +124,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/gpr/sync.cc ) s.files += %w( src/core/lib/gpr/sync_posix.cc ) s.files += %w( src/core/lib/gpr/sync_windows.cc ) - s.files += %w( src/core/lib/gpr/thd.cc ) - s.files += %w( src/core/lib/gpr/thd_posix.cc ) - s.files += %w( src/core/lib/gpr/thd_windows.cc ) s.files += %w( src/core/lib/gpr/time.cc ) s.files += %w( src/core/lib/gpr/time_posix.cc ) s.files += %w( src/core/lib/gpr/time_precise.cc ) @@ -136,6 +133,8 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/gpr/tmpfile_posix.cc ) s.files += %w( src/core/lib/gpr/tmpfile_windows.cc ) s.files += %w( src/core/lib/gpr/wrap_memcpy.cc ) + s.files += %w( src/core/lib/gprpp/thd_posix.cc ) + s.files += %w( src/core/lib/gprpp/thd_windows.cc ) s.files += %w( src/core/lib/profiling/basic_timers.cc ) s.files += %w( src/core/lib/profiling/stap_timers.cc ) s.files += %w( include/grpc/impl/codegen/byte_buffer.h ) |