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

Commit 4cd4b0c5 authored by Tianjie Xu's avatar Tianjie Xu Committed by Automerger Merge Worker
Browse files

Merge "Temporarily remove the care_map in the ota package" am: 3fcc5251 am: c8e5f1de 

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

Change-Id: I6c73d285c552e54e41aeb7be55e61479e9ffe069
parents 454757ca c8e5f1de

tools/releasetools/ota_from_target_files.py

+2 −0
Original line number Diff line number Diff line
@@ -1191,6 +1191,8 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None): 
    care_map_list = [x for x in ["care_map.pb", "care_map.txt"] if

                     "META/" + x in target_zip.namelist()]



    # TODO(b/205541521) remove the workaround after root cause is fixed.

    care_map_list = []

    # Adds care_map if either the protobuf format or the plain text one exists.

    if care_map_list:

      care_map_name = care_map_list[0]