Do not special-case block APEX.
Now APEX files are sized 4K-aligned. So, even when passed via block
apexes, apexd doesn't need to handle them differently.
Bug: 192991318
Test: ApexTestCases
Change-Id: I0ddf11802527bb98849ab05f4dac95c143a201d9
diff --git a/apexd/apex_file.cpp b/apexd/apex_file.cpp
index f5b76d6..152e580 100644
--- a/apexd/apex_file.cpp
+++ b/apexd/apex_file.cpp
@@ -25,7 +25,6 @@
#include <fstream>
#include <span>
-#include <android-base/endian.h>
#include <android-base/file.h>
#include <android-base/logging.h>
#include <android-base/scopeguard.h>
@@ -76,28 +75,6 @@
return Error() << "Couldn't find filesystem magic";
}
-Result<uint32_t> GetApexFileSize(borrowed_fd fd) {
- struct stat st;
- if (fstat(fd.get(), &st) != 0) {
- return ErrnoError() << "fstat() failed.";
- }
- if (S_ISREG(st.st_mode)) {
- return static_cast<uint32_t>(st.st_size);
- }
- // The size of a "block" apex is at the end of it.
- if (S_ISBLK(st.st_mode)) {
- uint32_t file_size = 0;
- if (lseek(fd.get(), -sizeof(file_size), SEEK_END) == -1) {
- return ErrnoError() << "lseek() failed.";
- }
- if (read(fd.get(), &file_size, sizeof(file_size)) == -1) {
- return ErrnoError() << "read() failed";
- }
- return betoh32(file_size);
- }
- return Error() << "Unknown file type: " << st.st_mode;
-}
-
} // namespace
Result<ApexFile> ApexFile::Open(const std::string& path) {
@@ -114,16 +91,11 @@
<< "I/O error";
}
- auto size = GetApexFileSize(fd);
- if (!size.ok()) {
- return size.error();
- }
-
ZipArchiveHandle handle;
auto handle_guard =
android::base::make_scope_guard([&handle] { CloseArchive(handle); });
- int ret = OpenArchiveFdRange(fd.get(), path.c_str(), &handle, *size,
- /*offset=*/0, /*assume_ownership=*/false);
+ int ret = OpenArchiveFd(fd.get(), path.c_str(), &handle,
+ /*assume_ownership=*/false);
if (ret < 0) {
return Error() << "Failed to open package " << path << ": "
<< ErrorCodeString(ret);
