Rename sparse_image_utils to sparse_image

Bug: b/434763749

Author: Databean

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

@@ -47,7 +47,7 @@ cf_cc_library(
     hdrs = ["de_android_sparse.h"],
     deps = [
         "//cuttlefish/common/libs/utils:result",
-        "//cuttlefish/host/libs/image_aggregator:sparse_image_utils",
+        "//cuttlefish/host/libs/image_aggregator:sparse_image",
         "//libbase",
         "//libsparse",
     ],
@@ -134,7 +134,7 @@ cf_cc_library(
         "//cuttlefish/host/commands/cvd/fetch:substitute",
         "//cuttlefish/host/commands/cvd/fetch:target_directories",
         "//cuttlefish/host/libs/config:fetcher_config",
-        "//cuttlefish/host/libs/image_aggregator:sparse_image_utils",
+        "//cuttlefish/host/libs/image_aggregator:sparse_image",
         "//cuttlefish/host/libs/web:android_build",
         "//cuttlefish/host/libs/web:android_build_api",
         "//cuttlefish/host/libs/web:android_build_string",

base/cvd/cuttlefish/host/commands/cvd/fetch/de_android_sparse.cc

@@ -25,7 +25,7 @@
 #include <sparse/sparse.h>
 
 #include "cuttlefish/common/libs/utils/result.h"
-#include "cuttlefish/host/libs/image_aggregator/sparse_image_utils.h"
+#include "cuttlefish/host/libs/image_aggregator/sparse_image.h"
 
 namespace cuttlefish {
 namespace {

base/cvd/cuttlefish/host/commands/cvd/fetch/fetch_cvd.cc

@@ -44,7 +44,7 @@
 #include "cuttlefish/host/commands/cvd/fetch/host_tools_target.h"
 #include "cuttlefish/host/commands/cvd/fetch/target_directories.h"
 #include "cuttlefish/host/libs/config/fetcher_config.h"
-#include "cuttlefish/host/libs/image_aggregator/sparse_image_utils.h"
+#include "cuttlefish/host/libs/image_aggregator/sparse_image.h"
 #include "cuttlefish/host/libs/web/android_build.h"
 #include "cuttlefish/host/libs/web/android_build_api.h"
 #include "cuttlefish/host/libs/web/android_build_string.h"

base/cvd/cuttlefish/host/libs/image_aggregator/BUILD.bazel

@@ -38,7 +38,7 @@ cf_cc_library(
         "//cuttlefish/host/libs/config:mbr",
         "//cuttlefish/host/libs/image_aggregator:cdisk_spec_cc_proto",
         "//cuttlefish/host/libs/image_aggregator:qcow2",
-        "//cuttlefish/host/libs/image_aggregator:sparse_image_utils",
+        "//cuttlefish/host/libs/image_aggregator:sparse_image",
         "//libbase",
         "//libsparse",
         "@protobuf",
@@ -47,15 +47,13 @@ cf_cc_library(
 )
 
 cf_cc_library(
-    name = "sparse_image_utils",
-    srcs = ["sparse_image_utils.cc"],
-    hdrs = ["sparse_image_utils.h"],
+    name = "sparse_image",
+    srcs = ["sparse_image.cc"],
+    hdrs = ["sparse_image.h"],
     deps = [
         "//cuttlefish/common/libs/fs",
         "//cuttlefish/common/libs/utils:result",
         "//cuttlefish/common/libs/utils:subprocess",
-        "//cuttlefish/host/libs/config:config_utils",
-        "//cuttlefish/host/libs/config:cuttlefish_config",
         "//cuttlefish/host/libs/config:known_paths",
         "//libbase",
     ],

base/cvd/cuttlefish/host/libs/image_aggregator/image_aggregator.cc

@@ -25,6 +25,9 @@
 #include <fcntl.h>
 #include <stdio.h>
 
+#include <sparse/sparse.h>
+#include <zlib.h>
+
 #include <fstream>
 #include <random>
 #include <string>
@@ -34,8 +37,6 @@
 #include <android-base/logging.h>
 #include <android-base/strings.h>
 #include <google/protobuf/text_format.h>
-#include <sparse/sparse.h>
-#include <zlib.h>
 
 #include "cuttlefish/common/libs/fs/shared_buf.h"
 #include "cuttlefish/common/libs/fs/shared_fd.h"
@@ -44,7 +45,7 @@
 #include "cuttlefish/host/libs/config/mbr.h"
 #include "cuttlefish/host/libs/image_aggregator/cdisk_spec.pb.h"
 #include "cuttlefish/host/libs/image_aggregator/qcow2.h"
-#include "cuttlefish/host/libs/image_aggregator/sparse_image_utils.h"
+#include "cuttlefish/host/libs/image_aggregator/sparse_image.h"
 
 namespace cuttlefish {
 namespace {

…s/image_aggregator/sparse_image_utils.cc …st/libs/image_aggregator/sparse_image.ccbase/cvd/cuttlefish/host/libs/image_aggregator/sparse_image_utils.cc renamed to base/cvd/cuttlefish/host/libs/image_aggregator/sparse_image.cc base/cvd/cuttlefish/host/libs/image_aggregator/sparse_image_utils.cc renamed to base/cvd/cuttlefish/host/libs/image_aggregator/sparse_image.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "cuttlefish/host/libs/image_aggregator/sparse_image_utils.h"
+#include "cuttlefish/host/libs/image_aggregator/sparse_image.h"
 
 #include <android-base/file.h>
 #include <android-base/logging.h>
@@ -28,8 +28,6 @@
 #include "cuttlefish/common/libs/fs/shared_fd.h"
 #include "cuttlefish/common/libs/utils/result.h"
 #include "cuttlefish/common/libs/utils/subprocess.h"
-#include "cuttlefish/host/libs/config/config_utils.h"
-#include "cuttlefish/host/libs/config/cuttlefish_config.h"
 #include "cuttlefish/host/libs/config/known_paths.h"
 
 namespace cuttlefish {