From caeff022dfec0a4a51bd7ac6831c9892a667911d Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Wed, 23 Sep 2015 14:18:55 -0700
Subject: [PATCH] Merge with gyp changes
---
grpc.gyp | 34 +++++++++++++++++++++-------------
src/core/surface/version.c | 4 +++-
2 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/grpc.gyp b/grpc.gyp
index c76276ba84c..60179f04ff7 100644
--- a/grpc.gyp
+++ b/grpc.gyp
@@ -205,9 +205,11 @@
'src/core/httpcli/parser.c',
'src/core/iomgr/alarm.c',
'src/core/iomgr/alarm_heap.c',
+ 'src/core/iomgr/closure.c',
'src/core/iomgr/endpoint.c',
'src/core/iomgr/endpoint_pair_posix.c',
'src/core/iomgr/endpoint_pair_windows.c',
+ 'src/core/iomgr/exec_ctx.c',
'src/core/iomgr/fd_posix.c',
'src/core/iomgr/iocp_windows.c',
'src/core/iomgr/iomgr.c',
@@ -238,6 +240,8 @@
'src/core/iomgr/wakeup_fd_nospecial.c',
'src/core/iomgr/wakeup_fd_pipe.c',
'src/core/iomgr/wakeup_fd_posix.c',
+ 'src/core/iomgr/workqueue_posix.c',
+ 'src/core/iomgr/workqueue_windows.c',
'src/core/json/json.c',
'src/core/json/json_reader.c',
'src/core/json/json_string.c',
@@ -387,9 +391,11 @@
'src/core/httpcli/parser.c',
'src/core/iomgr/alarm.c',
'src/core/iomgr/alarm_heap.c',
+ 'src/core/iomgr/closure.c',
'src/core/iomgr/endpoint.c',
'src/core/iomgr/endpoint_pair_posix.c',
'src/core/iomgr/endpoint_pair_windows.c',
+ 'src/core/iomgr/exec_ctx.c',
'src/core/iomgr/fd_posix.c',
'src/core/iomgr/iocp_windows.c',
'src/core/iomgr/iomgr.c',
@@ -420,6 +426,8 @@
'src/core/iomgr/wakeup_fd_nospecial.c',
'src/core/iomgr/wakeup_fd_pipe.c',
'src/core/iomgr/wakeup_fd_posix.c',
+ 'src/core/iomgr/workqueue_posix.c',
+ 'src/core/iomgr/workqueue_windows.c',
'src/core/json/json.c',
'src/core/json/json_reader.c',
'src/core/json/json_string.c',
@@ -1281,19 +1289,6 @@
'test/core/iomgr/alarm_list_test.c',
]
},
- {
- 'target_name': 'alarm_test',
- 'type': 'executable',
- 'dependencies': [
- 'grpc_test_util',
- 'grpc',
- 'gpr_test_util',
- 'gpr',
- ],
- 'sources': [
- 'test/core/iomgr/alarm_test.c',
- ]
- },
{
'target_name': 'alpn_test',
'type': 'executable',
@@ -2229,6 +2224,19 @@
'test/core/client_config/uri_parser_test.c',
]
},
+ {
+ 'target_name': 'workqueue_test',
+ 'type': 'executable',
+ 'dependencies': [
+ 'grpc_test_util',
+ 'grpc',
+ 'gpr_test_util',
+ 'gpr',
+ ],
+ 'sources': [
+ 'test/core/iomgr/workqueue_test.c',
+ ]
+ },
{
'target_name': 'h2_compress_bad_hostname_test',
'type': 'executable',
diff --git a/src/core/surface/version.c b/src/core/surface/version.c
index e559d51448a..4b90e06a043 100644
--- a/src/core/surface/version.c
+++ b/src/core/surface/version.c
@@ -36,4 +36,6 @@
#include <grpc/grpc.h>
-const char *grpc_version_string(void) { return "0.11.0.0"; }
+const char *grpc_version_string(void) {
+ return "0.11.0.0";
+}