Fruit is not helping make this code more readable.

https://github.com/google/android-cuttlefish/blob/cf0d080a6c140d1b1c823cce12baf6bb95ca2c0b/base/cvd/cuttlefish/host/commands/assemble_cvd/disk_flags.cc#L210

Bug: b/432098078

Author: Databean

base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel

@@ -174,7 +174,6 @@ cf_cc_library(
         "//cuttlefish/host/libs/feature:inject",
         "//cuttlefish/host/libs/vm_manager",
         "//libbase",
-        "@fruit",
         "@gflags",
     ],
 )

base/cvd/cuttlefish/host/commands/assemble_cvd/disk/BUILD.bazel

@@ -126,9 +126,7 @@ cf_cc_library(
         "//cuttlefish/common/libs/utils:files",
         "//cuttlefish/common/libs/utils:result",
         "//cuttlefish/host/commands/assemble_cvd:boot_image_utils",
-        "//cuttlefish/host/commands/assemble_cvd/disk:kernel_ramdisk_repacker",
         "//cuttlefish/host/libs/config:cuttlefish_config",
-        "//cuttlefish/host/libs/feature",
         "//libbase",
     ],
 )

base/cvd/cuttlefish/host/commands/assemble_cvd/disk/gem5_image_unpacker.cpp

@@ -21,15 +21,11 @@
 #include "cuttlefish/common/libs/utils/files.h"
 #include "cuttlefish/common/libs/utils/result.h"
 #include "cuttlefish/host/commands/assemble_cvd/boot_image_utils.h"
-#include "cuttlefish/host/commands/assemble_cvd/disk/kernel_ramdisk_repacker.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
-#include "cuttlefish/host/libs/feature/feature.h"
 
 namespace cuttlefish {
 
-Result<void> Gem5ImageUnpacker(
-    const CuttlefishConfig& config,
-    AutoSetup<RepackKernelRamdisk>::Type& /* dependency */) {
+Result<void> Gem5ImageUnpacker(const CuttlefishConfig& config) {
   if (config.vm_manager() != VmmMode::kGem5) {
     return {};
   }

base/cvd/cuttlefish/host/commands/assemble_cvd/disk/gem5_image_unpacker.h

@@ -16,13 +16,11 @@
 
 #pragma once
 
-#include "cuttlefish/host/commands/assemble_cvd/disk/kernel_ramdisk_repacker.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
-#include "cuttlefish/host/libs/feature/feature.h"
 
 namespace cuttlefish {
 
-Result<void> Gem5ImageUnpacker(const CuttlefishConfig&,
-                               AutoSetup<RepackKernelRamdisk>::Type&);
+// Requires KernelRamdiskRepacker
+Result<void> Gem5ImageUnpacker(const CuttlefishConfig&);
 
 }  // namespace cuttlefish

base/cvd/cuttlefish/host/commands/assemble_cvd/disk_flags.cc

@@ -25,7 +25,6 @@
 #include <android-base/parsebool.h>
 #include <android-base/parseint.h>
 #include <android-base/strings.h>
-#include <fruit/fruit.h>
 #include <gflags/gflags.h>
 
 #include "cuttlefish/common/libs/utils/files.h"
@@ -63,7 +62,6 @@
 #include "cuttlefish/host/libs/config/data_image.h"
 #include "cuttlefish/host/libs/config/fetcher_config.h"
 #include "cuttlefish/host/libs/config/instance_nums.h"
-#include "cuttlefish/host/libs/feature/inject.h"
 #include "cuttlefish/host/libs/vm_manager/gem5_manager.h"
 
 namespace cuttlefish {
@@ -207,24 +205,6 @@ static uint64_t AvailableSpaceAtPath(const std::string& path) {
   return static_cast<uint64_t>(vfs.f_frsize) * vfs.f_bavail;
 }
 
-static fruit::Component<> DiskChangesComponent(
-    const FetcherConfig* fetcher, const CuttlefishConfig* config,
-    const CuttlefishConfig::InstanceSpecific* instance) {
-  return fruit::createComponent()
-      .bindInstance(*fetcher)
-      .bindInstance(*config)
-      .bindInstance(*instance)
-      .install(CuttlefishKeyAvbComponent)
-      .install(AutoSetup<InitializeChromeOsState>::Component)
-      .install(AutoSetup<RepackKernelRamdisk>::Component)
-      .install(AutoSetup<VbmetaEnforceMinimumSize>::Component)
-      .install(AutoSetup<BootloaderPresentCheck>::Component)
-      .install(AutoSetup<Gem5ImageUnpacker>::Component)
-      // Create esp if necessary
-      .install(AutoSetup<InitializeEspImage>::Component)
-      .install(AutoSetup<RebuildSuperImageIfNecessary>::Component);
-}
-
 Result<void> DiskImageFlagsVectorization(
     CuttlefishConfig& config, const FetcherConfig& fetcher_config,
     const InitramfsPathFlag& initramfs_path, const KernelPathFlag& kernel_path,
@@ -492,16 +472,16 @@ Result<void> CreateDynamicDiskFiles(
     const FetcherConfig& fetcher_config, const CuttlefishConfig& config,
     const SystemImageDirFlag& system_image_dir) {
   for (const auto& instance : config.Instances()) {
-    // TODO(schuffelen): Unify this with the other injector created in
-    // assemble_cvd.cpp
-    fruit::Injector<> injector(DiskChangesComponent, &fetcher_config, &config,
-                               &instance);
-    for (auto& late_injected : injector.getMultibindings<LateInjected>()) {
-      CF_EXPECT(late_injected->LateInject(injector));
-    }
-
-    const auto& features = injector.getMultibindings<SetupFeature>();
-    CF_EXPECT(SetupFeature::RunSetup(features));
+    std::unique_ptr<Avb> avb = GetDefaultAvb();
+    CF_EXPECT(avb.get());
+
+    CF_EXPECT(InitializeChromeOsState(instance));
+    CF_EXPECT(RepackKernelRamdisk(config, instance, *avb));
+    CF_EXPECT(VbmetaEnforceMinimumSize(instance));
+    CF_EXPECT(BootloaderPresentCheck(instance));
+    CF_EXPECT(Gem5ImageUnpacker(config));  // Requires RepackKernelRamdisk
+    CF_EXPECT(InitializeEspImage(config, instance));
+    CF_EXPECT(RebuildSuperImageIfNecessary(fetcher_config, instance));
 
     CF_EXPECT(InitializeAccessKregistryImage(instance));
     CF_EXPECT(InitializeHwcomposerPmemImage(instance));