Merge "Fix signing failures on targets with >4GB target_files" into main am: 3b7d46f4ca

Original change: https://android-review.googlesource.com/c/platform/build/+/2920107

Change-Id: Idf55d804e19b1346e03b713b63bf58f73efe900d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-01-19 20:19:40 +00:00
committed by Automerger Merge Worker

View File

@@ -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