diff options
author | Mark D. Roth <roth@google.com> | 2016-10-18 11:06:33 -0700 |
---|---|---|
committer | Mark D. Roth <roth@google.com> | 2016-10-18 11:06:33 -0700 |
commit | 605a8f12ed078524823c46a36d16e433935e00a1 (patch) | |
tree | e42daa92a987b7868b14cbd444f22dcc6e466a97 /package.xml | |
parent | d7ec5e18cebc3d7fcfbc1a187b7407bf9f4ba38a (diff) | |
parent | f1e5d12030184f354a93fcef62ecca9663a0774e (diff) |
Merge remote-tracking branch 'upstream/master' into service_config
Diffstat (limited to 'package.xml')
-rw-r--r-- | package.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package.xml b/package.xml index 49b71eef0f..31a2822a75 100644 --- a/package.xml +++ b/package.xml @@ -231,10 +231,10 @@ <file baseinstalldir="/" name="src/core/lib/iomgr/timer_heap.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/iomgr/udp_server.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/iomgr/unix_sockets_posix.h" role="src" /> + <file baseinstalldir="/" name="src/core/lib/iomgr/wakeup_fd_cv.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/iomgr/wakeup_fd_pipe.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/iomgr/wakeup_fd_posix.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/iomgr/workqueue.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/iomgr/workqueue_posix.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/iomgr/workqueue_windows.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/json/json.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/json/json_common.h" role="src" /> @@ -399,11 +399,11 @@ <file baseinstalldir="/" name="src/core/lib/iomgr/udp_server.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/iomgr/unix_sockets_posix.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/iomgr/unix_sockets_posix_noop.c" role="src" /> + <file baseinstalldir="/" name="src/core/lib/iomgr/wakeup_fd_cv.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/iomgr/wakeup_fd_eventfd.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/iomgr/wakeup_fd_nospecial.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/iomgr/wakeup_fd_pipe.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/iomgr/wakeup_fd_posix.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/iomgr/workqueue_posix.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/iomgr/workqueue_windows.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/json/json.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/json/json_reader.c" role="src" /> |