diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-08-13 14:44:12 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-08-13 14:44:12 -0700 |
| commit | 1665059f632c0b753e5551eac374d790546e4dbc (patch) | |
| tree | 7f691c68201b4b236a261c0f5dd20a1731c64a57 /build.json | |
| parent | b802fc7732996719c85f8196d5fa6702cc4fcb77 (diff) | |
| parent | c16d9e4af81856e7e95e0f77775ab5e47dc68c2c (diff) | |
Merge branch 'master' of github.com:grpc/grpc into compression-interop
Diffstat (limited to 'build.json')
| -rw-r--r-- | build.json | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/build.json b/build.json index 010e53a6d5..72b93353c6 100644 --- a/build.json +++ b/build.json @@ -367,7 +367,6 @@ "include/grpc/support/atm_gcc_atomic.h", "include/grpc/support/atm_gcc_sync.h", "include/grpc/support/atm_win32.h", - "include/grpc/support/cancellable_platform.h", "include/grpc/support/cmdline.h", "include/grpc/support/cpu.h", "include/grpc/support/histogram.h", @@ -402,7 +401,6 @@ ], "src": [ "src/core/support/alloc.c", - "src/core/support/cancellable.c", "src/core/support/cmdline.c", "src/core/support/cpu_iphone.c", "src/core/support/cpu_linux.c", @@ -1122,18 +1120,6 @@ ] }, { - "name": "gpr_cancellable_test", - "build": "test", - "language": "c", - "src": [ - "test/core/support/cancellable_test.c" - ], - "deps": [ - "gpr_test_util", - "gpr" - ] - }, - { "name": "gpr_cmdline_test", "build": "test", "language": "c", |