[automerger skipped] Merge stage-aosp-rvc-ts-dev into rvc-dev am: 1b804d13e3 am: ef938ec67d am: f71c9a58c9 -s ours
am skip reason: Change-Id I54c668427c06c415584cc80d6e7d35d451b28393 with SHA-1 1521c58c5d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12203423
Change-Id: I4b15b5d24beeae87ac772c7ef0aa163ec8b99fa7
diff --git a/adb/client/incremental_utils.cpp b/adb/client/incremental_utils.cpp
index 3297a6d..dd117d2 100644
--- a/adb/client/incremental_utils.cpp
+++ b/adb/client/incremental_utils.cpp
@@ -305,7 +305,6 @@
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 @@
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 4ad60dd..ebf18f8 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;