From 83627f95dbe571d96710b5a94ea44d4efbd88485 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Wed, 5 Feb 2020 17:01:30 +0100 Subject: [PATCH 01/10] fix tools/bazel stdout --- tools/bazel | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/bazel b/tools/bazel index d5d517ba99e..a1785078e73 100755 --- a/tools/bazel +++ b/tools/bazel @@ -33,8 +33,7 @@ then fi VERSION=1.0.0 - -echo "INFO: Running bazel wrapper (see //tools/bazel for details), bazel version $VERSION will be used instead of system-wide bazel installation." +echo "INFO: Running bazel wrapper (see //tools/bazel for details), bazel version $VERSION will be used instead of system-wide bazel installation." >&2 BASEURL=https://github.com/bazelbuild/bazel/releases/download/ pushd "$(dirname "$0")" >/dev/null @@ -48,7 +47,7 @@ case $(uname -sm) in suffix=darwin-x86_64 ;; *) - echo "Unsupported architecture: $(uname -sm)" + echo "Unsupported architecture: $(uname -sm)" >&2 exit 1 ;; esac From 59673f051ee7888b47736e44d6c3fbf97cd8b80b Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Fri, 7 Feb 2020 03:12:30 -0500 Subject: [PATCH 02/10] set upb secure: false to avoid circular dependency on itself --- src/upb/gen_build_yaml.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/upb/gen_build_yaml.py b/src/upb/gen_build_yaml.py index f7b82993986..3239618f442 100755 --- a/src/upb/gen_build_yaml.py +++ b/src/upb/gen_build_yaml.py @@ -50,6 +50,7 @@ try: "third_party/upb/upb/table.int.h", "third_party/upb/upb/upb.h", ], + 'secure': False, }] except: pass From a19cb24e943c68ecbdff135f11abcc6ac67e9aa6 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Fri, 7 Feb 2020 03:30:13 -0500 Subject: [PATCH 03/10] set abseil library as secure=false --- src/abseil-cpp/gen_build_yaml.py | 1 + templates/Makefile.template | 1 + 2 files changed, 2 insertions(+) diff --git a/src/abseil-cpp/gen_build_yaml.py b/src/abseil-cpp/gen_build_yaml.py index 8a4657f0b3c..2f32a3e25c7 100755 --- a/src/abseil-cpp/gen_build_yaml.py +++ b/src/abseil-cpp/gen_build_yaml.py @@ -26,4 +26,5 @@ for build in builds: build['build'] = 'private' build['build_system'] = [] build['language'] = 'c' + build['secure'] = False print(yaml.dump({'libs': builds})) diff --git a/templates/Makefile.template b/templates/Makefile.template index 1532ba7258b..291fca200e9 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -1493,6 +1493,7 @@ "language": "c", "src": sorted(used_abseil_srcs), "hdr": sorted(used_abseil_hdrs), + "secure": False, }) %> ${makelib(grpc_abseil_lib)} From 7d90fa8891a9532c37b6f932b1d21257c7b94559 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Fri, 7 Feb 2020 04:55:44 -0500 Subject: [PATCH 04/10] fix typo in Makefile abseil dependency --- templates/Makefile.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Makefile.template b/templates/Makefile.template index 291fca200e9..7fae035c1e4 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -1585,7 +1585,7 @@ $(CARES_DEP) \ $(ADDRESS_SORTING_DEP) \ $(UPB_DEP) \ - $(LIBGRPC_ABSEIL_DEP) \ + $(GRPC_ABSEIL_DEP) \ % endif % endif % if lib.language == 'c++': From 2d73493b5e4e73f8705316c94d73adda65474dac Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Thu, 13 Feb 2020 01:49:00 -0500 Subject: [PATCH 05/10] dont segfault if --resolver_type is not supplied --- test/core/iomgr/resolve_address_posix_test.cc | 4 ++-- test/core/iomgr/resolve_address_test.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/core/iomgr/resolve_address_posix_test.cc b/test/core/iomgr/resolve_address_posix_test.cc index 4247bfa5950..2568f45b2ce 100644 --- a/test/core/iomgr/resolve_address_posix_test.cc +++ b/test/core/iomgr/resolve_address_posix_test.cc @@ -231,9 +231,9 @@ int main(int argc, char** argv) { gpr_log(GPR_INFO, "Warning: overriding resolver setting of %s", resolver.get()); } - if (gpr_stricmp(resolver_type, "native") == 0) { + if (resolver_type != nullptr && gpr_stricmp(resolver_type, "native") == 0) { GPR_GLOBAL_CONFIG_SET(grpc_dns_resolver, "native"); - } else if (gpr_stricmp(resolver_type, "ares") == 0) { + } else if (resolver_type != nullptr && gpr_stricmp(resolver_type, "ares") == 0) { GPR_GLOBAL_CONFIG_SET(grpc_dns_resolver, "ares"); } else { gpr_log(GPR_ERROR, "--resolver_type was not set to ares or native"); diff --git a/test/core/iomgr/resolve_address_test.cc b/test/core/iomgr/resolve_address_test.cc index 48d3f8eb105..bacb7196f71 100644 --- a/test/core/iomgr/resolve_address_test.cc +++ b/test/core/iomgr/resolve_address_test.cc @@ -353,9 +353,9 @@ int main(int argc, char** argv) { gpr_log(GPR_INFO, "Warning: overriding resolver setting of %s", resolver.get()); } - if (gpr_stricmp(resolver_type, "native") == 0) { + if (resolver_type != nullptr && gpr_stricmp(resolver_type, "native") == 0) { GPR_GLOBAL_CONFIG_SET(grpc_dns_resolver, "native"); - } else if (gpr_stricmp(resolver_type, "ares") == 0) { + } else if (resolver_type != nullptr && gpr_stricmp(resolver_type, "ares") == 0) { #ifndef GRPC_UV GPR_GLOBAL_CONFIG_SET(grpc_dns_resolver, "ares"); #endif From 9cd65c71b233123bab67ed82c98be07d7360a352 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Wed, 12 Feb 2020 10:00:32 -0500 Subject: [PATCH 06/10] add missing //test/cpp/interop:http2_client target --- test/cpp/interop/BUILD | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/test/cpp/interop/BUILD b/test/cpp/interop/BUILD index 433d354e9b6..3d0aed74e8b 100644 --- a/test/cpp/interop/BUILD +++ b/test/cpp/interop/BUILD @@ -227,3 +227,20 @@ grpc_cc_binary( "//test/cpp/util:test_config", ], ) + +grpc_cc_binary( + name = "http2_client", + srcs = [ + "http2_client.h", + "http2_client.cc", + ], + deps = [ + "//:grpc++", + "//src/proto/grpc/testing:empty_proto", + "//src/proto/grpc/testing:messages_proto", + "//src/proto/grpc/testing:test_proto", + "//test/core/util:grpc_test_util", + "//test/cpp/util:test_config", + "//test/cpp/util:test_util", + ], +) From 33e9718584cfdf594d20bbaf02b20d55e25f6752 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Thu, 13 Feb 2020 03:01:48 -0500 Subject: [PATCH 07/10] buildifier format --- test/cpp/interop/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/cpp/interop/BUILD b/test/cpp/interop/BUILD index 3d0aed74e8b..c54cc4719e0 100644 --- a/test/cpp/interop/BUILD +++ b/test/cpp/interop/BUILD @@ -231,8 +231,8 @@ grpc_cc_binary( grpc_cc_binary( name = "http2_client", srcs = [ - "http2_client.h", "http2_client.cc", + "http2_client.h", ], deps = [ "//:grpc++", From 7030fe8fcd047459fc9fbc8d0dd3969d98c972f2 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Thu, 13 Feb 2020 12:49:01 +0100 Subject: [PATCH 08/10] yapf code --- src/upb/gen_build_yaml.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/upb/gen_build_yaml.py b/src/upb/gen_build_yaml.py index 3239618f442..cb37814d0c7 100755 --- a/src/upb/gen_build_yaml.py +++ b/src/upb/gen_build_yaml.py @@ -26,12 +26,9 @@ out = {} try: out['libs'] = [{ - 'name': - 'upb', - 'build': - 'all', - 'language': - 'c', + 'name': 'upb', + 'build': 'all', + 'language': 'c', 'src': [ "third_party/upb/upb/decode.c", "third_party/upb/upb/encode.c", From f4c53f5e62e4b5244710ce534f3ee8d3afdd2742 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Thu, 13 Feb 2020 12:51:38 +0100 Subject: [PATCH 09/10] regenerate projects --- Makefile | 89 +++++++++----------------------------------------------- 1 file changed, 13 insertions(+), 76 deletions(-) diff --git a/Makefile b/Makefile index 30384b57a98..3750bdf78e7 100644 --- a/Makefile +++ b/Makefile @@ -3944,7 +3944,7 @@ PUBLIC_HEADERS_C += \ LIBGPR_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGPR_SRC)))) -$(LIBDIR)/$(CONFIG)/libgpr.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_ABSEIL_DEP) $(LIBGPR_OBJS) +$(LIBDIR)/$(CONFIG)/libgpr.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBGPR_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgpr.a @@ -5479,7 +5479,7 @@ PUBLIC_HEADERS_C += \ LIBGRPC_TEST_UTIL_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_TEST_UTIL_UNSECURE_SRC)))) -$(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_ABSEIL_DEP) $(LIBGRPC_TEST_UTIL_UNSECURE_OBJS) +$(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBGRPC_TEST_UTIL_UNSECURE_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a @@ -5846,7 +5846,7 @@ PUBLIC_HEADERS_C += \ LIBGRPC_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_UNSECURE_SRC)))) -$(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_ABSEIL_DEP) $(LIBGRPC_UNSECURE_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS) +$(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBGRPC_UNSECURE_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a @@ -7493,7 +7493,7 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARE else -$(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_UNSECURE_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS) +$(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_UNSECURE_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a @@ -7665,7 +7665,7 @@ $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: protobuf_dep_error else -$(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS) +$(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a @@ -8480,7 +8480,7 @@ $(LIBBORINGSSL_OBJS): CPPFLAGS += -Ithird_party/boringssl-with-bazel/src/include $(LIBBORINGSSL_OBJS): CXXFLAGS += -fno-exceptions $(LIBBORINGSSL_OBJS): CFLAGS += -g -$(LIBDIR)/$(CONFIG)/libboringssl.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_ABSEIL_DEP) $(LIBBORINGSSL_OBJS) +$(LIBDIR)/$(CONFIG)/libboringssl.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBBORINGSSL_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl.a @@ -8520,7 +8520,7 @@ $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a: protobuf_dep_error else -$(LIBDIR)/$(CONFIG)/libboringssl_test_util.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBBORINGSSL_TEST_UTIL_OBJS) +$(LIBDIR)/$(CONFIG)/libboringssl_test_util.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBBORINGSSL_TEST_UTIL_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a @@ -8575,7 +8575,7 @@ $(LIBDIR)/$(CONFIG)/libbenchmark.a: protobuf_dep_error else -$(LIBDIR)/$(CONFIG)/libbenchmark.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBBENCHMARK_OBJS) +$(LIBDIR)/$(CONFIG)/libbenchmark.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBBENCHMARK_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libbenchmark.a @@ -8607,18 +8607,7 @@ PUBLIC_HEADERS_C += \ LIBUPB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBUPB_SRC)))) -ifeq ($(NO_SECURE),true) - -# You can't build secure libraries if you don't have OpenSSL. - -$(LIBDIR)/$(CONFIG)/libupb.a: openssl_dep_error - -$(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): openssl_dep_error - -else - - -$(LIBDIR)/$(CONFIG)/libupb.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBUPB_OBJS) +$(LIBDIR)/$(CONFIG)/libupb.a: $(LIBUPB_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libupb.a @@ -8630,12 +8619,12 @@ endif ifeq ($(SYSTEM),MINGW32) -$(LIBDIR)/$(CONFIG)/upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(OPENSSL_DEP) +$(LIBDIR)/$(CONFIG)/upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/upb$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) else -$(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(OPENSSL_DEP) +$(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` ifeq ($(SYSTEM),Darwin) @@ -8647,13 +8636,9 @@ else endif endif -endif - -ifneq ($(NO_SECURE),true) ifneq ($(NO_DEPS),true) -include $(LIBUPB_OBJS:.o=.dep) endif -endif LIBZ_SRC = \ @@ -9064,7 +9049,7 @@ PUBLIC_HEADERS_C += \ LIBEND2END_NOSEC_TESTS_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBEND2END_NOSEC_TESTS_SRC)))) -$(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_ABSEIL_DEP) $(LIBEND2END_NOSEC_TESTS_OBJS) +$(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBEND2END_NOSEC_TESTS_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a @@ -9118,17 +9103,7 @@ LIBGRPC_ABSEIL_SRC = \ LIBGRPC_ABSEIL_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_ABSEIL_SRC)))) -ifeq ($(NO_SECURE),true) - -# You can't build secure libraries if you don't have OpenSSL. - -$(LIBDIR)/$(CONFIG)/libgrpc_abseil.a: openssl_dep_error - - -else - - -$(LIBDIR)/$(CONFIG)/libgrpc_abseil.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBGRPC_ABSEIL_OBJS) +$(LIBDIR)/$(CONFIG)/libgrpc_abseil.a: $(LIBGRPC_ABSEIL_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_abseil.a @@ -9140,13 +9115,9 @@ endif -endif - -ifneq ($(NO_SECURE),true) ifneq ($(NO_DEPS),true) -include $(LIBGRPC_ABSEIL_OBJS:.o=.dep) endif -endif # All of the test targets, and protoc plugins @@ -23548,40 +23519,6 @@ test/cpp/util/string_ref_helper.cc: $(OPENSSL_DEP) test/cpp/util/subprocess.cc: $(OPENSSL_DEP) test/cpp/util/test_config_cc.cc: $(OPENSSL_DEP) test/cpp/util/test_credentials_provider.cc: $(OPENSSL_DEP) -third_party/abseil-cpp/absl/base/dynamic_annotations.cc: $(OPENSSL_DEP) -third_party/abseil-cpp/absl/base/internal/cycleclock.cc: $(OPENSSL_DEP) -third_party/abseil-cpp/absl/base/internal/raw_logging.cc: $(OPENSSL_DEP) -third_party/abseil-cpp/absl/base/internal/spinlock.cc: $(OPENSSL_DEP) -third_party/abseil-cpp/absl/base/internal/spinlock_wait.cc: $(OPENSSL_DEP) -third_party/abseil-cpp/absl/base/internal/sysinfo.cc: $(OPENSSL_DEP) -third_party/abseil-cpp/absl/base/internal/thread_identity.cc: $(OPENSSL_DEP) -third_party/abseil-cpp/absl/base/internal/throw_delegate.cc: $(OPENSSL_DEP) -third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc: $(OPENSSL_DEP) -third_party/abseil-cpp/absl/base/log_severity.cc: $(OPENSSL_DEP) -third_party/abseil-cpp/absl/numeric/int128.cc: $(OPENSSL_DEP) -third_party/abseil-cpp/absl/strings/ascii.cc: $(OPENSSL_DEP) -third_party/abseil-cpp/absl/strings/charconv.cc: $(OPENSSL_DEP) -third_party/abseil-cpp/absl/strings/escaping.cc: $(OPENSSL_DEP) -third_party/abseil-cpp/absl/strings/internal/charconv_bigint.cc: $(OPENSSL_DEP) -third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc: $(OPENSSL_DEP) -third_party/abseil-cpp/absl/strings/internal/escaping.cc: $(OPENSSL_DEP) -third_party/abseil-cpp/absl/strings/internal/memutil.cc: $(OPENSSL_DEP) -third_party/abseil-cpp/absl/strings/internal/ostringstream.cc: $(OPENSSL_DEP) -third_party/abseil-cpp/absl/strings/internal/utf8.cc: $(OPENSSL_DEP) -third_party/abseil-cpp/absl/strings/match.cc: $(OPENSSL_DEP) -third_party/abseil-cpp/absl/strings/numbers.cc: $(OPENSSL_DEP) -third_party/abseil-cpp/absl/strings/str_cat.cc: $(OPENSSL_DEP) -third_party/abseil-cpp/absl/strings/str_replace.cc: $(OPENSSL_DEP) -third_party/abseil-cpp/absl/strings/str_split.cc: $(OPENSSL_DEP) -third_party/abseil-cpp/absl/strings/string_view.cc: $(OPENSSL_DEP) -third_party/abseil-cpp/absl/strings/substitute.cc: $(OPENSSL_DEP) -third_party/abseil-cpp/absl/types/bad_optional_access.cc: $(OPENSSL_DEP) -third_party/upb/upb/decode.c: $(OPENSSL_DEP) -third_party/upb/upb/encode.c: $(OPENSSL_DEP) -third_party/upb/upb/msg.c: $(OPENSSL_DEP) -third_party/upb/upb/port.c: $(OPENSSL_DEP) -third_party/upb/upb/table.c: $(OPENSSL_DEP) -third_party/upb/upb/upb.c: $(OPENSSL_DEP) endif .PHONY: all strip tools dep_error openssl_dep_error openssl_dep_message git_update stop buildtests buildtests_c buildtests_cxx test test_c test_cxx install install_c install_cxx install-headers install-headers_c install-headers_cxx install-shared install-shared_c install-shared_cxx install-static install-static_c install-static_cxx strip strip-shared strip-static strip_c strip-shared_c strip-static_c strip_cxx strip-shared_cxx strip-static_cxx dep_c dep_cxx bins_dep_c bins_dep_cxx clean From bd450a3146e5415fa000603fab99961fa74512be Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Thu, 13 Feb 2020 07:59:14 -0500 Subject: [PATCH 10/10] clang format code --- test/core/iomgr/resolve_address_posix_test.cc | 3 ++- test/core/iomgr/resolve_address_test.cc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/core/iomgr/resolve_address_posix_test.cc b/test/core/iomgr/resolve_address_posix_test.cc index 2568f45b2ce..cf7c4f60ddc 100644 --- a/test/core/iomgr/resolve_address_posix_test.cc +++ b/test/core/iomgr/resolve_address_posix_test.cc @@ -233,7 +233,8 @@ int main(int argc, char** argv) { } if (resolver_type != nullptr && gpr_stricmp(resolver_type, "native") == 0) { GPR_GLOBAL_CONFIG_SET(grpc_dns_resolver, "native"); - } else if (resolver_type != nullptr && gpr_stricmp(resolver_type, "ares") == 0) { + } else if (resolver_type != nullptr && + gpr_stricmp(resolver_type, "ares") == 0) { GPR_GLOBAL_CONFIG_SET(grpc_dns_resolver, "ares"); } else { gpr_log(GPR_ERROR, "--resolver_type was not set to ares or native"); diff --git a/test/core/iomgr/resolve_address_test.cc b/test/core/iomgr/resolve_address_test.cc index bacb7196f71..ca7c914f51b 100644 --- a/test/core/iomgr/resolve_address_test.cc +++ b/test/core/iomgr/resolve_address_test.cc @@ -355,7 +355,8 @@ int main(int argc, char** argv) { } if (resolver_type != nullptr && gpr_stricmp(resolver_type, "native") == 0) { GPR_GLOBAL_CONFIG_SET(grpc_dns_resolver, "native"); - } else if (resolver_type != nullptr && gpr_stricmp(resolver_type, "ares") == 0) { + } else if (resolver_type != nullptr && + gpr_stricmp(resolver_type, "ares") == 0) { #ifndef GRPC_UV GPR_GLOBAL_CONFIG_SET(grpc_dns_resolver, "ares"); #endif