From eba77f295ec2ca5d4857f3c4baef0c44e3262eb4 Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Thu, 30 Nov 2017 12:57:20 -0800 Subject: [PATCH] Update master to 1.9.0-dev --- packages/grpc-native-core/binding.gyp | 7 +++---- packages/grpc-native-core/deps/grpc | 2 +- packages/grpc-native-core/package.json | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/grpc-native-core/binding.gyp b/packages/grpc-native-core/binding.gyp index 0e489bd3..ddb91ec9 100644 --- a/packages/grpc-native-core/binding.gyp +++ b/packages/grpc-native-core/binding.gyp @@ -63,7 +63,6 @@ '-Wno-long-long', '-Wno-unused-parameter', '-DOSATOMIC_USE_INLINED=1', - '-Ithird_party/abseil-cpp', ], 'ldflags': [ '-g', @@ -186,7 +185,6 @@ '-Wno-long-long', '-Wno-unused-parameter', '-DOSATOMIC_USE_INLINED=1', - '-Ithird_party/abseil-cpp', ], 'OTHER_CPLUSPLUSFLAGS': [ '-g', @@ -196,7 +194,6 @@ '-Wno-long-long', '-Wno-unused-parameter', '-DOSATOMIC_USE_INLINED=1', - '-Ithird_party/abseil-cpp', '-stdlib=libc++', '-std=c++11', '-Wno-error=deprecated-declarations' @@ -615,6 +612,7 @@ 'deps/grpc/src/core/lib/support/env_linux.cc', 'deps/grpc/src/core/lib/support/env_posix.cc', 'deps/grpc/src/core/lib/support/env_windows.cc', + 'deps/grpc/src/core/lib/support/fork.cc', 'deps/grpc/src/core/lib/support/histogram.cc', 'deps/grpc/src/core/lib/support/host_port.cc', 'deps/grpc/src/core/lib/support/log.cc', @@ -624,7 +622,6 @@ 'deps/grpc/src/core/lib/support/log_windows.cc', 'deps/grpc/src/core/lib/support/mpscq.cc', 'deps/grpc/src/core/lib/support/murmur_hash.cc', - 'deps/grpc/src/core/lib/support/stack_lockfree.cc', 'deps/grpc/src/core/lib/support/string.cc', 'deps/grpc/src/core/lib/support/string_posix.cc', 'deps/grpc/src/core/lib/support/string_util_windows.cc', @@ -697,6 +694,8 @@ 'deps/grpc/src/core/lib/iomgr/ev_windows.cc', 'deps/grpc/src/core/lib/iomgr/exec_ctx.cc', 'deps/grpc/src/core/lib/iomgr/executor.cc', + 'deps/grpc/src/core/lib/iomgr/fork_posix.cc', + 'deps/grpc/src/core/lib/iomgr/fork_windows.cc', 'deps/grpc/src/core/lib/iomgr/gethostname_fallback.cc', 'deps/grpc/src/core/lib/iomgr/gethostname_host_name_max.cc', 'deps/grpc/src/core/lib/iomgr/gethostname_sysconf.cc', diff --git a/packages/grpc-native-core/deps/grpc b/packages/grpc-native-core/deps/grpc index dbca3d9b..ccd35033 160000 --- a/packages/grpc-native-core/deps/grpc +++ b/packages/grpc-native-core/deps/grpc @@ -1 +1 @@ -Subproject commit dbca3d9b765b8e13ead6327fdd4904fe0fa05c84 +Subproject commit ccd35033545226b9b38ab219c9eb8d0e4325b7c1 diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json index ef5e48f9..f216537a 100644 --- a/packages/grpc-native-core/package.json +++ b/packages/grpc-native-core/package.json @@ -1,6 +1,6 @@ { "name": "grpc", - "version": "1.8.0-dev", + "version": "1.9.0-dev", "author": "Google Inc.", "description": "gRPC Library for Node", "homepage": "https://grpc.io/",