From 12ac11025ed96eadd1497c7dfed5b889d34fa8a3 Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Fri, 19 Jan 2024 11:04:58 -0800 Subject: [PATCH] Fix signing failures on targets with >4GB target_files An old python zipfile hack prevented zipfile module from decoding 64 bit sizes correctly, remove the legacy hack to fix. Test: check_target_files_signatures -v 5GB_target_files.zip Bug: 319367048 Change-Id: I376c7b68f549ddf88680280d604548d1849cdfe2 --- .../check_target_files_signatures.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/tools/releasetools/check_target_files_signatures.py b/tools/releasetools/check_target_files_signatures.py index a7b35230ea..cdafb4b2e5 100755 --- a/tools/releasetools/check_target_files_signatures.py +++ b/tools/releasetools/check_target_files_signatures.py @@ -58,22 +58,6 @@ if sys.hexversion < 0x02070000: logger = logging.getLogger(__name__) -# Work around a bug in Python's zipfile module that prevents opening of zipfiles -# if any entry has an extra field of between 1 and 3 bytes (which is common with -# zipaligned APKs). This overrides the ZipInfo._decodeExtra() method (which -# contains the bug) with an empty version (since we don't need to decode the -# extra field anyway). -# Issue #14315: https://bugs.python.org/issue14315, fixed in Python 2.7.8 and -# Python 3.5.0 alpha 1. - - -class MyZipInfo(zipfile.ZipInfo): - def _decodeExtra(self): - pass - - -zipfile.ZipInfo = MyZipInfo - OPTIONS = common.OPTIONS