Merge "Fix read file error in extract_apks" into main am: 4ad574cc37 am: 458618af33

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

Change-Id: I1b73a6eee3e6259ab15fcdcbe3069ce168570a77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ray Chin
2023-09-23 05:57:52 +00:00
committed by Automerger Merge Worker

View File

@@ -76,8 +76,8 @@ func (apkSet *ApkSet) getToc() (Toc, error) {
if err != nil {
return nil, err
}
bytes := make([]byte, tocFile.FileHeader.UncompressedSize64)
if _, err := rc.Read(bytes); err != nil && err != io.EOF {
bytes, err := io.ReadAll(rc)
if err != nil {
return nil, err
}
rc.Close()