StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Order entries in apex_info.pb" am: 6fb4c8dcee

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2536083

Change-Id: I1cb8e4aca08ea4298c5e832087c088ed958795a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-04-14 20:55:03 +00:00
committed by Automerger Merge Worker
parent bdc1b58380 6fb4c8dcee
commit f4c40a7eb2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/releasetools/apex_utils.py
View File

@@ -626,7 +626,7 @@ def GetApexInfoFromTargetFiles(input_file, partition, compressed_only=True):
if os.path.isfile(deapexer_path): if os.path.isfile(deapexer_path):
deapexer = deapexer_path deapexer = deapexer_path
for apex_filename in os.listdir(target_dir): for apex_filename in sorted(os.listdir(target_dir)):
apex_filepath = os.path.join(target_dir, apex_filename) apex_filepath = os.path.join(target_dir, apex_filename)
if not os.path.isfile(apex_filepath) or \ if not os.path.isfile(apex_filepath) or \
not zipfile.is_zipfile(apex_filepath): not zipfile.is_zipfile(apex_filepath):