Rename libzip_cc/zip_cc.h to libzip_cc/archive.h

Databean · Databean · commit d83557e79bea · 2025-11-11T02:35:14.000Z
Bug: b/458815945
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/BUILD.bazel b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/BUILD.bazel
@@ -35,7 +35,7 @@ cf_cc_library(
         "//cuttlefish/host/commands/cvd/instances",
         "//cuttlefish/host/commands/cvd/utils",
         "//cuttlefish/host/libs/zip:zip_file",
-        "//cuttlefish/host/libs/zip/libzip_cc:zip_cc",
+        "//cuttlefish/host/libs/zip/libzip_cc:archive",
         "//libbase",
         "@fmt",
     ],
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/commands/bugreport.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/commands/bugreport.cpp
@@ -44,7 +44,7 @@
 #include "cuttlefish/host/commands/cvd/instances/instance_group_record.h"
 #include "cuttlefish/host/commands/cvd/instances/instance_manager.h"
 #include "cuttlefish/host/commands/cvd/utils/common.h"
-#include "cuttlefish/host/libs/zip/libzip_cc/zip_cc.h"
+#include "cuttlefish/host/libs/zip/libzip_cc/archive.h"
 #include "cuttlefish/host/libs/zip/zip_file.h"
 
 namespace cuttlefish {
diff --git a/base/cvd/cuttlefish/host/commands/cvd/fetch/BUILD.bazel b/base/cvd/cuttlefish/host/commands/cvd/fetch/BUILD.bazel
@@ -141,7 +141,7 @@ cf_cc_library(
         "//cuttlefish/host/libs/web:build_api_zip",
         "//cuttlefish/host/libs/web:build_zip_name",
         "//cuttlefish/host/libs/zip:zip_file",
-        "//cuttlefish/host/libs/zip/libzip_cc:zip_cc",
+        "//cuttlefish/host/libs/zip/libzip_cc:archive",
         "//libbase",
         "@abseil-cpp//absl/strings",
         "@fmt",
@@ -177,7 +177,7 @@ cf_cc_library(
         "//cuttlefish/host/libs/web:luci_build_api",
         "//cuttlefish/host/libs/web/http_client:curl_global_init",
         "//cuttlefish/host/libs/zip:zip_string",
-        "//cuttlefish/host/libs/zip/libzip_cc:zip_cc",
+        "//cuttlefish/host/libs/zip/libzip_cc:archive",
         "//libbase",
         "@abseil-cpp//absl/strings",
     ],
diff --git a/base/cvd/cuttlefish/host/commands/cvd/fetch/fetch_context.cc b/base/cvd/cuttlefish/host/commands/cvd/fetch/fetch_context.cc
@@ -40,7 +40,7 @@
 #include "cuttlefish/host/libs/web/build_api.h"
 #include "cuttlefish/host/libs/web/build_api_zip.h"
 #include "cuttlefish/host/libs/web/build_zip_name.h"
-#include "cuttlefish/host/libs/zip/libzip_cc/zip_cc.h"
+#include "cuttlefish/host/libs/zip/libzip_cc/archive.h"
 #include "cuttlefish/host/libs/zip/zip_file.h"
 
 namespace cuttlefish {
diff --git a/base/cvd/cuttlefish/host/commands/cvd/fetch/fetch_context.h b/base/cvd/cuttlefish/host/commands/cvd/fetch/fetch_context.h
@@ -28,7 +28,7 @@
 #include "cuttlefish/host/libs/config/fetcher_config.h"
 #include "cuttlefish/host/libs/web/android_build.h"
 #include "cuttlefish/host/libs/web/build_api.h"
-#include "cuttlefish/host/libs/zip/libzip_cc/zip_cc.h"
+#include "cuttlefish/host/libs/zip/libzip_cc/archive.h"
 
 namespace cuttlefish {
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/fetch/fetch_cvd.cc b/base/cvd/cuttlefish/host/commands/cvd/fetch/fetch_cvd.cc
@@ -51,7 +51,7 @@
 #include "cuttlefish/host/libs/web/chrome_os_build_string.h"
 #include "cuttlefish/host/libs/web/http_client/curl_global_init.h"
 #include "cuttlefish/host/libs/web/luci_build_api.h"
-#include "cuttlefish/host/libs/zip/libzip_cc/zip_cc.h"
+#include "cuttlefish/host/libs/zip/libzip_cc/archive.h"
 #include "cuttlefish/host/libs/zip/zip_string.h"
 
 namespace cuttlefish {
diff --git a/base/cvd/cuttlefish/host/libs/web/BUILD.bazel b/base/cvd/cuttlefish/host/libs/web/BUILD.bazel
@@ -99,8 +99,8 @@ cf_cc_library(
         "//cuttlefish/host/libs/web:android_build",
         "//cuttlefish/host/libs/web:build_api",
         "//cuttlefish/host/libs/zip:buffered_zip_source",
+        "//cuttlefish/host/libs/zip/libzip_cc:archive",
         "//cuttlefish/host/libs/zip/libzip_cc:source",
-        "//cuttlefish/host/libs/zip/libzip_cc:zip_cc",
     ],
 )
 
diff --git a/base/cvd/cuttlefish/host/libs/web/build_api_zip.cc b/base/cvd/cuttlefish/host/libs/web/build_api_zip.cc
@@ -23,7 +23,7 @@
 #include "cuttlefish/host/libs/web/build_api.h"
 #include "cuttlefish/host/libs/zip/buffered_zip_source.h"
 #include "cuttlefish/host/libs/zip/libzip_cc/source.h"
-#include "cuttlefish/host/libs/zip/libzip_cc/zip_cc.h"
+#include "cuttlefish/host/libs/zip/libzip_cc/archive.h"
 
 namespace cuttlefish {
 
diff --git a/base/cvd/cuttlefish/host/libs/web/build_api_zip.h b/base/cvd/cuttlefish/host/libs/web/build_api_zip.h
@@ -20,7 +20,7 @@
 #include "cuttlefish/common/libs/utils/result.h"
 #include "cuttlefish/host/libs/web/android_build.h"
 #include "cuttlefish/host/libs/web/build_api.h"
-#include "cuttlefish/host/libs/zip/libzip_cc/zip_cc.h"
+#include "cuttlefish/host/libs/zip/libzip_cc/archive.h"
 
 namespace cuttlefish {
 
diff --git a/base/cvd/cuttlefish/host/libs/zip/BUILD.bazel b/base/cvd/cuttlefish/host/libs/zip/BUILD.bazel
@@ -129,8 +129,8 @@ cf_cc_test(
         "//cuttlefish/host/libs/web/http_client:fake_http_client",
         "//cuttlefish/host/libs/zip:remote_zip",
         "//cuttlefish/host/libs/zip:zip_string",
+        "//cuttlefish/host/libs/zip/libzip_cc:archive",
         "//cuttlefish/host/libs/zip/libzip_cc:source",
-        "//cuttlefish/host/libs/zip/libzip_cc:zip_cc",
         "@abseil-cpp//absl/strings",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
@@ -194,9 +194,9 @@ cf_cc_library(
         "//cuttlefish/common/libs/utils:files",
         "//cuttlefish/common/libs/utils:result",
         "//cuttlefish/host/libs/zip:zip_copy",
+        "//cuttlefish/host/libs/zip/libzip_cc:archive",
         "//cuttlefish/host/libs/zip/libzip_cc:source",
         "//cuttlefish/host/libs/zip/libzip_cc:stat",
-        "//cuttlefish/host/libs/zip/libzip_cc:zip_cc",
     ],
 )
 
@@ -206,7 +206,7 @@ cf_cc_library(
     hdrs = ["zip_string.h"],
     deps = [
         "//cuttlefish/common/libs/utils:result",
+        "//cuttlefish/host/libs/zip/libzip_cc:archive",
         "//cuttlefish/host/libs/zip/libzip_cc:source",
-        "//cuttlefish/host/libs/zip/libzip_cc:zip_cc",
     ],
 )
diff --git a/base/cvd/cuttlefish/host/libs/zip/libzip_cc/BUILD.bazel b/base/cvd/cuttlefish/host/libs/zip/libzip_cc/BUILD.bazel
@@ -6,6 +6,23 @@ package(
 
 exports_files([".clang-tidy"])
 
+cf_cc_library(
+    name = "archive",
+    srcs = ["archive.cc"],
+    hdrs = ["archive.h"],
+    features = ["-layering_check"],  # libzip
+    linkopts = ["-llzma"],  # libzip
+    linkstatic = True,  # libzip
+    deps = [
+        "//cuttlefish/common/libs/utils:result",
+        "//cuttlefish/host/libs/zip/libzip_cc:error",
+        "//cuttlefish/host/libs/zip/libzip_cc:managed",
+        "//cuttlefish/host/libs/zip/libzip_cc:source",
+        "@libzip",
+        "@zlib",
+    ],
+)
+
 cf_cc_library(
     name = "error",
     srcs = ["error.cc"],
@@ -57,20 +74,3 @@ cf_cc_library(
     name = "source_callback",
     hdrs = ["source_callback.h"],
 )
-
-cf_cc_library(
-    name = "zip_cc",
-    srcs = ["zip_cc.cc"],
-    hdrs = ["zip_cc.h"],
-    features = ["-layering_check"],  # libzip
-    linkopts = ["-llzma"],  # libzip
-    linkstatic = True,  # libzip
-    deps = [
-        "//cuttlefish/common/libs/utils:result",
-        "//cuttlefish/host/libs/zip/libzip_cc:error",
-        "//cuttlefish/host/libs/zip/libzip_cc:managed",
-        "//cuttlefish/host/libs/zip/libzip_cc:source",
-        "@libzip",
-        "@zlib",
-    ],
-)
diff --git a/base/cvd/cuttlefish/host/libs/zip/libzip_cc/archive.cc b/base/cvd/cuttlefish/host/libs/zip/libzip_cc/archive.cc
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "cuttlefish/host/libs/zip/libzip_cc/zip_cc.h"
+#include "cuttlefish/host/libs/zip/libzip_cc/archive.h"
 
 #include <stddef.h>
 #include <stdint.h>
diff --git a/base/cvd/cuttlefish/host/libs/zip/libzip_cc/archive.h b/base/cvd/cuttlefish/host/libs/zip/libzip_cc/archive.h
diff --git a/base/cvd/cuttlefish/host/libs/zip/remote_zip_test.cc b/base/cvd/cuttlefish/host/libs/zip/remote_zip_test.cc
@@ -34,7 +34,7 @@
 #include "cuttlefish/host/libs/web/http_client/fake_http_client.h"
 #include "cuttlefish/host/libs/web/http_client/http_client.h"
 #include "cuttlefish/host/libs/zip/libzip_cc/source.h"
-#include "cuttlefish/host/libs/zip/libzip_cc/zip_cc.h"
+#include "cuttlefish/host/libs/zip/libzip_cc/archive.h"
 #include "cuttlefish/host/libs/zip/zip_string.h"
 
 namespace cuttlefish {
diff --git a/base/cvd/cuttlefish/host/libs/zip/zip_builder.cc b/base/cvd/cuttlefish/host/libs/zip/zip_builder.cc
@@ -23,7 +23,7 @@
 
 #include "cuttlefish/common/libs/utils/files.h"
 #include "cuttlefish/common/libs/utils/result.h"
-#include "cuttlefish/host/libs/zip/libzip_cc/zip_cc.h"
+#include "cuttlefish/host/libs/zip/libzip_cc/archive.h"
 
 namespace cuttlefish {
 
diff --git a/base/cvd/cuttlefish/host/libs/zip/zip_file.cc b/base/cvd/cuttlefish/host/libs/zip/zip_file.cc
@@ -27,7 +27,7 @@
 #include "cuttlefish/common/libs/utils/result.h"
 #include "cuttlefish/host/libs/zip/libzip_cc/source.h"
 #include "cuttlefish/host/libs/zip/libzip_cc/stat.h"
-#include "cuttlefish/host/libs/zip/libzip_cc/zip_cc.h"
+#include "cuttlefish/host/libs/zip/libzip_cc/archive.h"
 #include "cuttlefish/host/libs/zip/zip_copy.h"
 
 namespace cuttlefish {
diff --git a/base/cvd/cuttlefish/host/libs/zip/zip_file.h b/base/cvd/cuttlefish/host/libs/zip/zip_file.h
@@ -18,7 +18,7 @@
 #include <string>
 
 #include "cuttlefish/common/libs/utils/result.h"
-#include "cuttlefish/host/libs/zip/libzip_cc/zip_cc.h"
+#include "cuttlefish/host/libs/zip/libzip_cc/archive.h"
 
 namespace cuttlefish {
 
diff --git a/base/cvd/cuttlefish/host/libs/zip/zip_string.cc b/base/cvd/cuttlefish/host/libs/zip/zip_string.cc
@@ -24,7 +24,7 @@
 
 #include "cuttlefish/common/libs/utils/result.h"
 #include "cuttlefish/host/libs/zip/libzip_cc/source.h"
-#include "cuttlefish/host/libs/zip/libzip_cc/zip_cc.h"
+#include "cuttlefish/host/libs/zip/libzip_cc/archive.h"
 
 namespace cuttlefish {
 
diff --git a/base/cvd/cuttlefish/host/libs/zip/zip_string.h b/base/cvd/cuttlefish/host/libs/zip/zip_string.h
@@ -18,7 +18,7 @@
 #include <string>
 
 #include "cuttlefish/common/libs/utils/result.h"
-#include "cuttlefish/host/libs/zip/libzip_cc/zip_cc.h"
+#include "cuttlefish/host/libs/zip/libzip_cc/archive.h"
 
 namespace cuttlefish {
 

Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,8 @@ cf_cc_library(`
`99`	`99`	`"//cuttlefish/host/libs/web:android_build",`
`100`	`100`	`"//cuttlefish/host/libs/web:build_api",`
`101`	`101`	`"//cuttlefish/host/libs/zip:buffered_zip_source",`
	`102`	`+ "//cuttlefish/host/libs/zip/libzip_cc:archive",`
`102`	`103`	`"//cuttlefish/host/libs/zip/libzip_cc:source",`
`103`		`- "//cuttlefish/host/libs/zip/libzip_cc:zip_cc",`
`104`	`104`	`],`
`105`	`105`	`)`
`106`	`106`