Rebased grpc submodule on top of master from upstream

jkryl · Oct 22, 2019 · d4f6cfb · d4f6cfb
1 parent 8cca6de
commit d4f6cfb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/packages/grpc-native-core/binding.gyp b/packages/grpc-native-core/binding.gyp
@@ -680,7 +680,6 @@
         'deps/grpc/src/core/lib/gpr/log_linux.cc',
         'deps/grpc/src/core/lib/gpr/log_posix.cc',
         'deps/grpc/src/core/lib/gpr/log_windows.cc',
-        'deps/grpc/src/core/lib/gpr/mpscq.cc',
         'deps/grpc/src/core/lib/gpr/murmur_hash.cc',
         'deps/grpc/src/core/lib/gpr/string.cc',
         'deps/grpc/src/core/lib/gpr/string_posix.cc',
@@ -702,6 +701,7 @@
         'deps/grpc/src/core/lib/gprpp/fork.cc',
         'deps/grpc/src/core/lib/gprpp/global_config_env.cc',
         'deps/grpc/src/core/lib/gprpp/host_port.cc',
+        'deps/grpc/src/core/lib/gprpp/mpscq.cc',
         'deps/grpc/src/core/lib/gprpp/thd_posix.cc',
         'deps/grpc/src/core/lib/gprpp/thd_windows.cc',
         'deps/grpc/src/core/lib/profiling/basic_timers.cc',
@@ -1048,12 +1048,14 @@
         'deps/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc',
         'deps/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc',
         'deps/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc',
-        'deps/grpc/src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c',
+	'deps/grpc/src/core/ext/filters/client_channel/lb_policy/xds/xds.cc',
         'deps/grpc/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc',
-        'deps/grpc/src/core/ext/filters/client_channel/lb_policy/xds/xds.cc',
-        'deps/grpc/src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_secure.cc',
-        'deps/grpc/src/core/ext/filters/client_channel/lb_policy/xds/xds_client_stats.cc',
-        'deps/grpc/src/core/ext/filters/client_channel/lb_policy/xds/xds_load_balancer_api.cc',
+        'deps/grpc/src/core/ext/filters/client_channel/xds/xds_api.cc',
+        'deps/grpc/src/core/ext/filters/client_channel/xds/xds_bootstrap.cc',
+        'deps/grpc/src/core/ext/filters/client_channel/xds/xds_client.cc',
+        'deps/grpc/src/core/ext/filters/client_channel/xds/xds_client_stats.cc',
+        'deps/grpc/src/core/ext/filters/client_channel/xds/xds_channel.cc',
+        'deps/grpc/src/core/ext/filters/client_channel/xds/xds_channel_secure.cc',
         'deps/grpc/src/core/ext/upb-generated/envoy/api/v2/auth/cert.upb.c',
         'deps/grpc/src/core/ext/upb-generated/envoy/api/v2/cds.upb.c',
         'deps/grpc/src/core/ext/upb-generated/envoy/api/v2/cluster/circuit_breaker.upb.c',
@@ -1074,6 +1076,7 @@
         'deps/grpc/src/core/ext/upb-generated/envoy/api/v2/core/protocol.upb.c',
         'deps/grpc/src/core/ext/upb-generated/envoy/type/percent.upb.c',
         'deps/grpc/src/core/ext/upb-generated/envoy/type/range.upb.c',
+        'deps/grpc/src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c',
         'deps/grpc/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc',
         'deps/grpc/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc',
         'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc',

diff --git a/packages/grpc-native-core/deps/grpc b/packages/grpc-native-core/deps/grpc
diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "grpc-uds",
-  "version": "0.1.1",
+  "version": "0.1.4",
   "author": "Jan Kryl & Google Inc.",
   "description": "TEMPORARY and EXPERIMENTAL gRPC Library for Node supporting Unix Domain Sockets",
   "homepage": "https://grpc.io/",
@@ -56,11 +56,13 @@
     "deps/grpc/src/core/**/*.{c,cc,h}",
     "deps/grpc/src/boringssl/err_data.c",
     "deps/grpc/third_party/abseil-cpp/absl/**/*.{h,hh}",
+    "deps/grpc/third_party/address_sorting/**/*.{c,h}",
     "deps/grpc/third_party/boringssl/crypto/**/*.{c,cc,h}",
     "deps/grpc/third_party/boringssl/include/**/*.{c,cc,h}",
     "deps/grpc/third_party/boringssl/ssl/**/*.{c,cc,h}",
     "deps/grpc/third_party/boringssl/third_party/**/*.{c,h}",
-    "deps/grpc/third_party/upb/**/*.{c,h}",
+    "deps/grpc/third_party/cares/**/*.{c,cc,h}",
+    "deps/grpc/third_party/upb/**/*.{c,h,inc}",
     "deps/grpc/third_party/zlib/**/*.{c,cc,h}",
     "binding.gyp"
   ],