From 38284a07a2b07641563eecacf8550c3a2d18c179 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Thu, 7 Jul 2022 10:26:50 -0700
Subject: [PATCH] Revert "[build] Automate deps for grpc_base (#29995)"
 (#30234)

* Revert "[build] Automate deps for grpc_base (#29995)"

This reverts commit 5956fb8829c9917eb37c70a9a37aa72132547eed.

* fix merge

* Automated change: Fix sanity tests

Co-authored-by: ctiller <ctiller@users.noreply.github.com>
---
 BUILD | 69 +++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 43 insertions(+), 26 deletions(-)

diff --git a/BUILD b/BUILD
index f29018de1fc..891493a3a27 100644
--- a/BUILD
+++ b/BUILD
@@ -418,7 +418,7 @@ grpc_cc_library(
         "channel_init",
         "channel_stack_type",
         "config",
-        "event_engine_base",
+        "default_event_engine_factory_hdrs",
         "gpr_base",
         "grpc_authorization_base",
         "grpc_base",
@@ -477,7 +477,7 @@ grpc_cc_library(
         "channel_init",
         "channel_stack_type",
         "config",
-        "event_engine_base",
+        "default_event_engine_factory_hdrs",
         "gpr_base",
         "grpc_authorization_base",
         "grpc_base",
@@ -1230,7 +1230,7 @@ grpc_cc_library(
     tags = ["grpc-autodeps"],
     deps = [
         "activity",
-        "event_engine_base",
+        "default_event_engine_factory_hdrs",
         "event_engine_base_hdrs",
         "exec_ctx",
         "gpr_base",
@@ -2247,6 +2247,32 @@ grpc_cc_library(
     ],
 )
 
+grpc_cc_library(
+    name = "default_event_engine_factory_hdrs",
+    hdrs = [
+        "src/core/lib/event_engine/event_engine_factory.h",
+    ],
+    deps = [
+        "event_engine_base_hdrs",
+        "gpr_base",
+    ],
+)
+
+grpc_cc_library(
+    name = "default_event_engine_factory",
+    srcs = [
+        "src/core/lib/event_engine/default_event_engine_factory.cc",
+    ],
+    external_deps = ["absl/memory"],
+    deps = [
+        "default_event_engine_factory_hdrs",
+        "event_engine_base_hdrs",
+        "gpr_base",
+        "iomgr_event_engine",
+        "iomgr_port",
+    ],
+)
+
 grpc_cc_library(
     name = "iomgr_ee_time_averaged_stats",
     srcs = ["src/core/lib/event_engine/iomgr_engine/time_averaged_stats.cc"],
@@ -2380,21 +2406,15 @@ grpc_cc_library(
 grpc_cc_library(
     name = "event_engine_base",
     srcs = [
-        "src/core/lib/event_engine/default_event_engine_factory.cc",
         "src/core/lib/event_engine/event_engine.cc",
     ],
-    hdrs = [
-        "src/core/lib/event_engine/event_engine_factory.h",
-    ],
-    external_deps = [
-        "absl/memory",
-    ],
     deps = [
+        "default_event_engine_factory",
+        "default_event_engine_factory_hdrs",
         "event_engine_base_hdrs",
         "event_engine_trace",
         "gpr_base",
         "grpc_trace",
-        "iomgr_event_engine",
     ],
 )
 
@@ -2714,16 +2734,13 @@ grpc_cc_library(
         "absl/base:core_headers",
         "absl/container:flat_hash_map",
         "absl/container:inlined_vector",
-        "absl/functional:function_ref",
+        "absl/functional:bind_front",
         "absl/memory",
         "absl/meta:type_traits",
-        "absl/random",
-        "absl/status",
         "absl/status:statusor",
-        "absl/strings",
+        "absl/status",
         "absl/strings:str_format",
-        "absl/synchronization",
-        "absl/time",
+        "absl/strings",
         "absl/types:optional",
         "absl/types:variant",
         "absl/utility",
@@ -2731,10 +2748,8 @@ grpc_cc_library(
     ],
     language = "c++",
     public_hdrs = GRPC_PUBLIC_HDRS + GRPC_PUBLIC_EVENT_ENGINE_HDRS,
-    tags = ["grpc-autodeps"],
     visibility = ["@grpc:alt_grpc_base_legacy"],
     deps = [
-        "activity",
         "arena",
         "arena_promise",
         "atomic_utils",
@@ -2749,27 +2764,29 @@ grpc_cc_library(
         "chunked_vector",
         "closure",
         "config",
-        "context",
         "cpp_impl_of",
         "debug_location",
+        "default_event_engine_factory",
+        "default_event_engine_factory_hdrs",
         "dual_ref_counted",
         "error",
         "event_engine_base",
+        "event_engine_common",
         "exec_ctx",
         "gpr_base",
         "gpr_codegen",
         "gpr_tls",
         "grpc_codegen",
-        "grpc_public_hdrs",
         "grpc_sockaddr",
         "grpc_trace",
-        "iomgr_fwd",
+        "handshaker_registry",
         "iomgr_port",
         "iomgr_timer",
         "json",
         "latch",
         "memory_quota",
         "orphanable",
+        "percent_encoding",
         "poll",
         "promise",
         "ref_counted",
@@ -3161,9 +3178,9 @@ grpc_cc_library(
         "config",
         "construct_destruct",
         "debug_location",
+        "default_event_engine_factory_hdrs",
         "dual_ref_counted",
         "error",
-        "event_engine_base",
         "gpr_base",
         "gpr_codegen",
         "grpc_backend_metric_data",
@@ -3635,8 +3652,8 @@ grpc_cc_library(
         "channel_stack_type",
         "config",
         "debug_location",
+        "default_event_engine_factory_hdrs",
         "error",
-        "event_engine_base",
         "gpr_base",
         "gpr_codegen",
         "grpc_base",
@@ -4438,8 +4455,8 @@ grpc_cc_library(
     deps = [
         "channel_args",
         "debug_location",
+        "default_event_engine_factory_hdrs",
         "error",
-        "event_engine_base",
         "gpr_base",
         "gpr_platform",
         "grpc_base",
@@ -6697,7 +6714,7 @@ grpc_cc_library(
     visibility = ["@grpc:public"],
     deps = [
         "debug_location",
-        "event_engine_base",
+        "default_event_engine_factory_hdrs",
         "gpr",
         "grpc++",
         "grpc++_codegen_base",