diff options
-rw-r--r-- | adb/client/incremental_utils.cpp | 3 | ||||
-rw-r--r-- | adb/client/incremental_utils.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/adb/client/incremental_utils.cpp b/adb/client/incremental_utils.cpp index 3297a6d3c..dd117d228 100644 --- a/adb/client/incremental_utils.cpp +++ b/adb/client/incremental_utils.cpp @@ -305,7 +305,6 @@ static std::pair<ZipArchiveHandle, std::unique_ptr<android::base::MappedFile>> o static std::vector<int32_t> InstallationPriorityBlocks(borrowed_fd fd, Size fileSize) { static constexpr std::array<std::string_view, 3> additional_matches = { "resources.arsc"sv, "AndroidManifest.xml"sv, "classes.dex"sv}; - auto [zip, _] = openZipArchive(fd, fileSize); if (!zip) { return {}; @@ -359,7 +358,7 @@ static std::vector<int32_t> InstallationPriorityBlocks(borrowed_fd fd, Size file std::vector<int32_t> PriorityBlocksForFile(const std::string& filepath, borrowed_fd fd, Size fileSize) { - if (!android::base::EndsWithIgnoreCase(filepath, ".apk")) { + if (!android::base::EndsWithIgnoreCase(filepath, ".apk"sv)) { return {}; } off64_t signerOffset = SignerBlockOffset(fd, fileSize); diff --git a/adb/client/incremental_utils.h b/adb/client/incremental_utils.h index 4ad60dd28..ebf18f8cb 100644 --- a/adb/client/incremental_utils.h +++ b/adb/client/incremental_utils.h @@ -25,8 +25,6 @@ #include <stdint.h> -#include <android-base/off64_t.h> - namespace incremental { using Size = int64_t; |