grpc 1.67.0 → 1.69.0.pre1

data/src/core/lib/iomgr/ev_epoll1_linux.cc

@@ -18,8 +18,8 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/iomgr/port.h"
+#include "src/core/util/crash.h"
 
 // This polling engine is only relevant on linux kernels supporting epoll
 // epoll_create() or epoll_create1()
@@ -27,6 +27,8 @@
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/cpu.h>
 #include <limits.h>
 #include <poll.h>
 #include <pthread.h>
@@ -43,12 +45,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/cpu.h>
-
-#include "src/core/lib/gprpp/manual_constructor.h"
-#include "src/core/lib/gprpp/strerror.h"
 #include "src/core/lib/iomgr/block_annotate.h"
 #include "src/core/lib/iomgr/ev_epoll1_linux.h"
 #include "src/core/lib/iomgr/ev_posix.h"
@@ -57,6 +53,8 @@
 #include "src/core/lib/iomgr/wakeup_fd_posix.h"
 #include "src/core/telemetry/stats.h"
 #include "src/core/telemetry/stats_data.h"
+#include "src/core/util/manual_constructor.h"
+#include "src/core/util/strerror.h"
 #include "src/core/util/string.h"
 #include "src/core/util/useful.h"
 
@@ -708,7 +706,7 @@ static grpc_error_handle process_epoll_events(grpc_pollset* /*pollset*/) {
 
 // NOTE ON SYNCHRONIZATION: At any point of time, only the g_active_poller
 // (i.e the designated poller thread) will be calling this function. So there is
-// no need for any synchronization when accesing fields in g_epoll_set
+// no need for any synchronization when accessing fields in g_epoll_set
 static grpc_error_handle do_epoll_wait(grpc_pollset* ps,
                                        grpc_core::Timestamp deadline) {
   int r;
@@ -1011,7 +1009,7 @@ static grpc_error_handle pollset_work(grpc_pollset* ps,
     // threads
 
     // process_epoll_events() returns very quickly: It just queues the work on
-    // exec_ctx but does not execute it (the actual exectution or more
+    // exec_ctx but does not execute it (the actual execution or more
     // accurately grpc_core::ExecCtx::Get()->Flush() happens in end_worker()
     // AFTER selecting a designated poller). So we are not waiting long periods
     // without a designated poller

data/src/core/lib/iomgr/ev_poll_posix.cc

@@ -25,6 +25,7 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <grpc/support/alloc.h>
 #include <limits.h>
 #include <poll.h>
 #include <string.h>
@@ -37,17 +38,14 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/alloc.h>
-
-#include "src/core/lib/gprpp/crash.h"
-#include "src/core/lib/gprpp/thd.h"
 #include "src/core/lib/iomgr/block_annotate.h"
 #include "src/core/lib/iomgr/ev_poll_posix.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
 #include "src/core/lib/iomgr/wakeup_fd_posix.h"
 #include "src/core/telemetry/stats.h"
 #include "src/core/telemetry/stats_data.h"
+#include "src/core/util/crash.h"
+#include "src/core/util/thd.h"
 #include "src/core/util/useful.h"
 
 #define GRPC_POLLSET_KICK_BROADCAST ((grpc_pollset_worker*)1)

data/src/core/lib/iomgr/ev_posix.cc

@@ -23,22 +23,20 @@
 
 #ifdef GRPC_POSIX_SOCKET_EV
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
 #include <string.h>
 
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_split.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
-#include "src/core/lib/config/config_vars.h"
+#include "src/core/config/config_vars.h"
 #include "src/core/lib/debug/trace.h"
-#include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/iomgr/ev_epoll1_linux.h"
 #include "src/core/lib/iomgr/ev_poll_posix.h"
 #include "src/core/lib/iomgr/ev_posix.h"
 #include "src/core/lib/iomgr/internal_errqueue.h"
+#include "src/core/util/crash.h"
 #include "src/core/util/useful.h"
 
 /// Default poll() function - a pointer so that it can be overridden by some

data/src/core/lib/iomgr/ev_posix.h

@@ -23,9 +23,8 @@
 
 #ifdef GRPC_POSIX_SOCKET_EV
 
-#include <poll.h>
-
 #include <grpc/support/port_platform.h>
+#include <poll.h>
 
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"

data/src/core/lib/iomgr/event_engine_shims/closure.cc

@@ -13,13 +13,12 @@
 // limitations under the License.
 #include "src/core/lib/iomgr/event_engine_shims/closure.h"
 
-#include "absl/functional/any_invocable.h"
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/functional/any_invocable.h"
+#include "absl/log/log.h"
+#include "absl/status/status.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/transport/error_utils.h"

data/src/core/lib/iomgr/event_engine_shims/closure.h

@@ -14,11 +14,10 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_EVENT_ENGINE_SHIMS_CLOSURE_H
 #define GRPC_SRC_CORE_LIB_IOMGR_EVENT_ENGINE_SHIMS_CLOSURE_H
 
-#include "absl/functional/any_invocable.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/functional/any_invocable.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 

data/src/core/lib/iomgr/event_engine_shims/endpoint.cc

@@ -13,6 +13,13 @@
 // limitations under the License.
 #include "src/core/lib/iomgr/event_engine_shims/endpoint.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/impl/codegen/slice.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
+
 #include <atomic>
 #include <memory>
 #include <utility>
@@ -23,22 +30,11 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/impl/codegen/slice.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/extensions/can_track_errors.h"
 #include "src/core/lib/event_engine/extensions/supports_fd.h"
 #include "src/core/lib/event_engine/query_extensions.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
-#include "src/core/lib/gprpp/construct_destruct.h"
-#include "src/core/lib/gprpp/debug_location.h"
-#include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/error.h"
@@ -47,7 +43,10 @@
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/slice/slice_string_helpers.h"
 #include "src/core/lib/transport/error_utils.h"
+#include "src/core/util/construct_destruct.h"
+#include "src/core/util/debug_location.h"
 #include "src/core/util/string.h"
+#include "src/core/util/sync.h"
 
 namespace grpc_event_engine {
 namespace experimental {

data/src/core/lib/iomgr/event_engine_shims/endpoint.h

@@ -13,11 +13,11 @@
 // limitations under the License.
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_EVENT_ENGINE_SHIMS_ENDPOINT_H
 #define GRPC_SRC_CORE_LIB_IOMGR_EVENT_ENGINE_SHIMS_ENDPOINT_H
-#include <memory>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
 #include "src/core/lib/iomgr/endpoint.h"
 
 namespace grpc_event_engine {

data/src/core/lib/iomgr/event_engine_shims/tcp_client.cc

@@ -13,13 +13,12 @@
 // limitations under the License.
 #include "src/core/lib/iomgr/event_engine_shims/tcp_client.h"
 
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/default_event_engine.h"

data/src/core/lib/iomgr/exec_ctx.cc

@@ -18,16 +18,15 @@
 
 #include "src/core/lib/iomgr/exec_ctx.h"
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/strings/str_format.h"
-
 #include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
 
-#include "src/core/lib/gprpp/crash.h"
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/strings/str_format.h"
 #include "src/core/lib/iomgr/combiner.h"
 #include "src/core/lib/iomgr/error.h"
+#include "src/core/util/crash.h"
 
 static void exec_ctx_run(grpc_closure* closure) {
 #ifndef NDEBUG

data/src/core/lib/iomgr/exec_ctx.h

@@ -19,29 +19,27 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_EXEC_CTX_H
 #define GRPC_SRC_CORE_LIB_IOMGR_EXEC_CTX_H
 
-#include <limits>
-
 #include <grpc/support/port_platform.h>
 
+#include <limits>
+
 #if __APPLE__
 // Provides TARGET_OS_IPHONE
 #include <TargetConditionals.h>
 #endif
 
-#include "absl/log/check.h"
-
 #include <grpc/impl/grpc_types.h>
 #include <grpc/support/atm.h>
 #include <grpc/support/cpu.h>
 #include <grpc/support/time.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/experiments/experiments.h"
-#include "src/core/lib/gprpp/crash.h"
-#include "src/core/lib/gprpp/debug_location.h"
-#include "src/core/lib/gprpp/fork.h"
-#include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/iomgr/closure.h"
+#include "src/core/util/debug_location.h"
+#include "src/core/util/fork.h"
 #include "src/core/util/latent_see.h"
+#include "src/core/util/time.h"
 #include "src/core/util/time_precise.h"
 
 #if !defined(_WIN32) || !defined(_DLL)

data/src/core/lib/iomgr/executor.cc

@@ -18,22 +18,20 @@
 
 #include "src/core/lib/iomgr/executor.h"
 
-#include <string.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/strings/str_format.h"
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/cpu.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
+#include <string.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/strings/str_format.h"
 #include "src/core/lib/debug/trace_impl.h"
-#include "src/core/lib/gprpp/crash.h"
-#include "src/core/lib/gprpp/memory.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
+#include "src/core/util/crash.h"
+#include "src/core/util/memory.h"
 #include "src/core/util/useful.h"
 
 #define MAX_DEPTH 2

data/src/core/lib/iomgr/executor.h

@@ -21,9 +21,9 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/gprpp/thd.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/util/spinlock.h"
+#include "src/core/util/thd.h"
 
 namespace grpc_core {
 

data/src/core/lib/iomgr/fork_posix.cc

@@ -26,21 +26,19 @@
 #include <pthread.h>
 #endif
 
-#include <string.h>
-
-#include "absl/log/log.h"
-
 #include <grpc/fork.h>
 #include <grpc/grpc.h>
+#include <string.h>
 
-#include "src/core/lib/gprpp/crash.h"
-#include "src/core/lib/gprpp/fork.h"
-#include "src/core/lib/gprpp/thd.h"
+#include "absl/log/log.h"
 #include "src/core/lib/iomgr/ev_posix.h"
 #include "src/core/lib/iomgr/executor.h"
 #include "src/core/lib/iomgr/timer_manager.h"
 #include "src/core/lib/iomgr/wakeup_fd_posix.h"
 #include "src/core/lib/surface/init_internally.h"
+#include "src/core/util/crash.h"
+#include "src/core/util/fork.h"
+#include "src/core/util/thd.h"
 
 //
 // NOTE: FORKING IS NOT GENERALLY SUPPORTED, THIS IS ONLY INTENDED TO WORK

data/src/core/lib/iomgr/fork_windows.cc

@@ -22,10 +22,10 @@
 
 #ifndef GRPC_POSIX_FORK
 
-#include "absl/log/log.h"
-
 #include <grpc/fork.h>
 
+#include "absl/log/log.h"
+
 //
 // NOTE: FORKING IS NOT GENERALLY SUPPORTED, THIS IS ONLY INTENDED TO WORK
 //       AROUND VERY SPECIFIC USE CASES.

data/src/core/lib/iomgr/internal_errqueue.cc

@@ -14,10 +14,9 @@
 
 #include "src/core/lib/iomgr/internal_errqueue.h"
 
-#include "absl/log/log.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/iomgr/port.h"
 
 #ifdef GRPC_POSIX_SOCKET_TCP
@@ -27,7 +26,7 @@
 #include <string.h>
 #include <sys/utsname.h>
 
-#include "src/core/lib/gprpp/strerror.h"
+#include "src/core/util/strerror.h"
 
 namespace grpc_core {
 

data/src/core/lib/iomgr/iocp_windows.cc

@@ -22,24 +22,22 @@
 
 #ifdef GRPC_WINSOCK_SOCKET
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/log_windows.h>
 #include <winsock2.h>
 
 #include <limits>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/log_windows.h>
-
-#include "src/core/lib/gprpp/crash.h"
-#include "src/core/lib/gprpp/thd.h"
 #include "src/core/lib/iomgr/iocp_windows.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
 #include "src/core/lib/iomgr/socket_windows.h"
 #include "src/core/lib/iomgr/timer.h"
 #include "src/core/telemetry/stats.h"
 #include "src/core/telemetry/stats_data.h"
+#include "src/core/util/crash.h"
+#include "src/core/util/thd.h"
 
 static ULONG g_iocp_kick_token;
 static OVERLAPPED g_iocp_custom_overlap;

data/src/core/lib/iomgr/iomgr.cc

@@ -18,20 +18,16 @@
 
 #include "src/core/lib/iomgr/iomgr.h"
 
-#include <inttypes.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "absl/log/log.h"
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/sync.h>
+#include <inttypes.h>
+#include <stdlib.h>
+#include <string.h>
 
-#include "src/core/lib/config/config_vars.h"
-#include "src/core/lib/gprpp/crash.h"
-#include "src/core/lib/gprpp/thd.h"
+#include "absl/log/log.h"
+#include "src/core/config/config_vars.h"
 #include "src/core/lib/iomgr/buffer_list.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/executor.h"
@@ -39,7 +35,9 @@
 #include "src/core/lib/iomgr/iomgr_internal.h"
 #include "src/core/lib/iomgr/timer.h"
 #include "src/core/lib/iomgr/timer_manager.h"
+#include "src/core/util/crash.h"
 #include "src/core/util/string.h"
+#include "src/core/util/thd.h"
 #include "src/core/util/useful.h"
 
 static gpr_mu g_mu;

data/src/core/lib/iomgr/iomgr.h

@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_IOMGR_H
 #define GRPC_SRC_CORE_LIB_IOMGR_IOMGR_H
 
-#include <stdlib.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdlib.h>
 
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/port.h"

data/src/core/lib/iomgr/iomgr_internal.cc

@@ -18,9 +18,8 @@
 
 #include "src/core/lib/iomgr/iomgr_internal.h"
 
-#include <stddef.h>
-
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 static grpc_iomgr_platform_vtable* iomgr_platform_vtable = nullptr;
 

data/src/core/lib/iomgr/iomgr_internal.h

@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_IOMGR_INTERNAL_H
 #define GRPC_SRC_CORE_LIB_IOMGR_IOMGR_INTERNAL_H
 
-#include <stdbool.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdbool.h>
 
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"

data/src/core/lib/iomgr/iomgr_posix.cc

@@ -85,7 +85,8 @@ void grpc_set_default_iomgr_platform() {
 }
 
 bool grpc_iomgr_run_in_background() {
-  return grpc_event_engine_run_in_background();
+  return grpc_core::IsEventEngineCallbackCqEnabled() ||
+         grpc_event_engine_run_in_background();
 }
 
 #endif  // GRPC_POSIX_SOCKET_IOMGR

data/src/core/lib/iomgr/iomgr_windows.cc

@@ -23,9 +23,7 @@
 #ifdef GRPC_WINSOCK_SOCKET
 
 #include "absl/log/check.h"
-
 #include "src/core/lib/experiments/experiments.h"
-#include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/iomgr/iocp_windows.h"
 #include "src/core/lib/iomgr/iomgr.h"
 #include "src/core/lib/iomgr/pollset_windows.h"
@@ -36,6 +34,7 @@
 #include "src/core/lib/iomgr/tcp_client.h"
 #include "src/core/lib/iomgr/tcp_server.h"
 #include "src/core/lib/iomgr/timer.h"
+#include "src/core/util/crash.h"
 
 extern grpc_tcp_server_vtable grpc_windows_tcp_server_vtable;
 extern grpc_tcp_server_vtable grpc_windows_event_engine_tcp_server_vtable;
@@ -108,6 +107,8 @@ void grpc_set_default_iomgr_platform() {
   grpc_set_iomgr_platform_vtable(&vtable);
 }
 
-bool grpc_iomgr_run_in_background() { return false; }
+bool grpc_iomgr_run_in_background() {
+  return grpc_core::IsEventEngineCallbackCqEnabled();
+}
 
 #endif  // GRPC_WINSOCK_SOCKET

data/src/core/lib/iomgr/lockfree_event.cc

@@ -18,14 +18,13 @@
 
 #include "src/core/lib/iomgr/lockfree_event.h"
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/debug/trace.h"
-#include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
+#include "src/core/util/crash.h"
 
 // 'state' holds the to call when the fd is readable or writable respectively.
 // It can contain one of the following values:

data/src/core/lib/iomgr/nameser.h

@@ -82,7 +82,7 @@ typedef enum __ns_type {
   ns_t_cert = 37,      // Certification record
   ns_t_a6 = 38,        // IPv6 address (deprecates AAAA)
   ns_t_dname = 39,     // Non-terminal DNAME (for IPv6)
-  ns_t_sink = 40,      // Kitchen sink (experimentatl)
+  ns_t_sink = 40,      // Kitchen sink (experimental)
   ns_t_opt = 41,       // EDNS0 option (meta-RR)
   ns_t_apl = 42,       // Address prefix list (RFC3123)
   ns_t_ds = 43,        // Delegation Signer (RFC4034)

data/src/core/lib/iomgr/polling_entity.cc

@@ -18,13 +18,12 @@
 
 #include "src/core/lib/iomgr/polling_entity.h"
 
-#include "absl/log/check.h"
-#include "absl/strings/str_format.h"
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/gprpp/crash.h"
+#include "absl/log/check.h"
+#include "absl/strings/str_format.h"
+#include "src/core/util/crash.h"
 
 grpc_polling_entity grpc_polling_entity_create_from_pollset_set(
     grpc_pollset_set* pollset_set) {

data/src/core/lib/iomgr/pollset_set_windows.cc

@@ -16,9 +16,8 @@
 //
 //
 
-#include <stdint.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
 #include "src/core/lib/iomgr/port.h"
 

data/src/core/lib/iomgr/pollset_windows.cc

@@ -22,12 +22,12 @@
 
 #ifdef GRPC_WINSOCK_SOCKET
 
-#include "src/core/lib/gprpp/crash.h"
-#include "src/core/lib/gprpp/thd.h"
 #include "src/core/lib/iomgr/iocp_windows.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
 #include "src/core/lib/iomgr/pollset.h"
 #include "src/core/lib/iomgr/pollset_windows.h"
+#include "src/core/util/crash.h"
+#include "src/core/util/thd.h"
 
 #define GRPC_POLLSET_KICK_BROADCAST ((grpc_pollset_worker*)1)
 

data/src/core/lib/iomgr/port.h

@@ -40,8 +40,8 @@
 #define GRPC_HAVE_IP_PKTINFO 1
 #define GRPC_HAVE_MSG_NOSIGNAL 1
 #define GRPC_HAVE_UNIX_SOCKET 1
-#if defined(LINUX_VERSION_CODE) && defined(__GLIBC_PREREQ)
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0) && __GLIBC_PREREQ(2, 18)
+#if defined(LINUX_VERSION_CODE) && defined(__NDK_MAJOR__)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0) && __NDK_MAJOR__ >= 14
 #define GRPC_HAVE_VSOCK 1
 #endif
 #endif

data/src/core/lib/iomgr/resolve_address.cc

@@ -17,14 +17,13 @@
 //
 #include "src/core/lib/iomgr/resolve_address.h"
 
-#include "absl/strings/str_cat.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/gprpp/crash.h"
-#include "src/core/lib/gprpp/no_destruct.h"
+#include "absl/strings/str_cat.h"
+#include "src/core/util/crash.h"
+#include "src/core/util/no_destruct.h"
 
 namespace grpc_core {
 const char* kDefaultSecurePort = "https";