From 9d81e9ef61041d4143f489df255bd950baa8613c Mon Sep 17 00:00:00 2001 From: billfeng327 Date: Mon, 25 Feb 2019 15:21:08 -0800 Subject: [PATCH 1/4] updated version of abseil for enabling windows bazel build --- bazel/grpc_deps.bzl | 8 ++++---- third_party/abseil-cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl index 61a46e1ee5c..e2e47292242 100644 --- a/bazel/grpc_deps.bzl +++ b/bazel/grpc_deps.bzl @@ -170,8 +170,8 @@ def grpc_deps(): if "com_google_absl" not in native.existing_rules(): http_archive( name = "com_google_absl", - strip_prefix = "abseil-cpp-cd95e71df6eaf8f2a282b1da556c2cf1c9b09207", - url = "https://github.com/abseil/abseil-cpp/archive/cd95e71df6eaf8f2a282b1da556c2cf1c9b09207.tar.gz", + strip_prefix = "abseil-cpp-308ce31528a7edfa39f5f6d36142278a0ae1bf45", + url = "https://github.com/abseil/abseil-cpp/archive/308ce31528a7edfa39f5f6d36142278a0ae1bf45.tar.gz", ) if "com_github_bazelbuild_bazeltoolchains" not in native.existing_rules(): @@ -196,8 +196,8 @@ def grpc_deps(): if "io_opencensus_cpp" not in native.existing_rules(): http_archive( name = "io_opencensus_cpp", - strip_prefix = "opencensus-cpp-fdf0f308b1631bb4a942e32ba5d22536a6170274", - url = "https://github.com/census-instrumentation/opencensus-cpp/archive/fdf0f308b1631bb4a942e32ba5d22536a6170274.tar.gz", + strip_prefix = "opencensus-cpp-03dff0352522983ffdee48cedbf87cbe37f1bb7f", + url = "https://github.com/census-instrumentation/opencensus-cpp/archive/03dff0352522983ffdee48cedbf87cbe37f1bb7f.tar.gz", ) if "upb" not in native.existing_rules(): diff --git a/third_party/abseil-cpp b/third_party/abseil-cpp index cc4bed2d74f..308ce31528a 160000 --- a/third_party/abseil-cpp +++ b/third_party/abseil-cpp @@ -1 +1 @@ -Subproject commit cc4bed2d74f7c8717e31f9579214ab52a9c9c610 +Subproject commit 308ce31528a7edfa39f5f6d36142278a0ae1bf45 From 0eaa2cd6bd6732c943fe93df37b2a5d8399aa190 Mon Sep 17 00:00:00 2001 From: billfeng327 Date: Tue, 26 Feb 2019 10:28:18 -0800 Subject: [PATCH 2/4] added selective header inclusion for Windows --- .../filters/load_reporting/server_load_reporting_filter.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc index d7fd73fd6b2..b5b756c7407 100644 --- a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc +++ b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc @@ -30,7 +30,13 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/context.h" #include "src/core/lib/iomgr/resolve_address.h" + +#ifdef WIN32 +#include "src/core/lib/iomgr/sockaddr_windows.h" +#else #include "src/core/lib/iomgr/sockaddr_posix.h" +#endif + #include "src/core/lib/iomgr/socket_utils.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/slice/slice_internal.h" From 3f3da2e23f32e640ab4e8c71eed49ffedc6c0bf3 Mon Sep 17 00:00:00 2001 From: billfeng327 Date: Tue, 26 Feb 2019 10:42:18 -0800 Subject: [PATCH 3/4] submodule update --- third_party/abseil-cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/abseil-cpp b/third_party/abseil-cpp index 308ce31528a..cc4bed2d74f 160000 --- a/third_party/abseil-cpp +++ b/third_party/abseil-cpp @@ -1 +1 @@ -Subproject commit 308ce31528a7edfa39f5f6d36142278a0ae1bf45 +Subproject commit cc4bed2d74f7c8717e31f9579214ab52a9c9c610 From 1e4b70606886d1e880185377c35a06a42900142c Mon Sep 17 00:00:00 2001 From: billfeng327 Date: Tue, 26 Feb 2019 12:51:54 -0800 Subject: [PATCH 4/4] used universal header file --- .../load_reporting/server_load_reporting_filter.cc | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc index b5b756c7407..1d373c5b994 100644 --- a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc +++ b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc @@ -30,13 +30,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/context.h" #include "src/core/lib/iomgr/resolve_address.h" - -#ifdef WIN32 -#include "src/core/lib/iomgr/sockaddr_windows.h" -#else -#include "src/core/lib/iomgr/sockaddr_posix.h" -#endif - +#include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/slice/slice_internal.h"