Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bc1d4b9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Order entries in apex_info.pb" am: 6fb4c8dc am: f4c40a7e am: 1b07bfec 

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



Change-Id: I55e34ce4dfb725158af0abacd814e8d638d97413
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 77dd8b71 1b07bfec

tools/releasetools/apex_utils.py

+1 −1
Original line number Diff line number Diff line
@@ -626,7 +626,7 @@ def GetApexInfoFromTargetFiles(input_file, partition, compressed_only=True): 
    if os.path.isfile(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)

    if not os.path.isfile(apex_filepath) or \

            not zipfile.is_zipfile(apex_filepath):