diff options
| author | Justin DeMartino <jjdemartino@google.com> | 2020-10-14 19:39:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-14 19:39:53 +0000 |
| commit | 0d11af03e43f110b0bb160f7e20436d0043e3038 (patch) | |
| tree | 48f8bcca856276ec73a86dd3fb26143d3ca64578 /adb/client/incremental_utils.cpp | |
| parent | 075666ebd0dee8d0c4a2efa54f7c324a3f67ee2a (diff) | |
| parent | a6c01e4e98d2b343dcecfc99611e2e6250c730db (diff) | |
Merge changes from topic "SP1A.200921.001" into s-keystone-qcom-dev
* changes:
fs_mgr: adb-remount-test.sh: filter out more administrivia mounts.
Merge SP1A.200921.001 Change-Id: I90b97c4e9fb10b1f45e74def404823eed5b1aaa8
Diffstat (limited to 'adb/client/incremental_utils.cpp')
| -rw-r--r-- | adb/client/incremental_utils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/adb/client/incremental_utils.cpp b/adb/client/incremental_utils.cpp index dd117d228..d8b10e18b 100644 --- a/adb/client/incremental_utils.cpp +++ b/adb/client/incremental_utils.cpp @@ -325,7 +325,7 @@ static std::vector<int32_t> InstallationPriorityBlocks(borrowed_fd fd, Size file } std::vector<int32_t> installationPriorityBlocks; - ZipEntry entry; + ZipEntry64 entry; std::string_view entryName; while (Next(cookie, &entry, &entryName) == 0) { if (entryName == "classes.dex"sv) { |