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

Commit 7af4876c authored by Tianjie Xu's avatar Tianjie Xu Committed by Automerger Merge Worker
Browse files

Merge "Add apex info to the streaming property file" am: 8b92dab1 

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

Change-Id: Ie028c42744df4aaf8c94caebd0d3f9484e8297ff
parents 0982fa81 8b92dab1

tools/releasetools/ota_from_target_files.py

+2 −0
Original line number Diff line number Diff line
@@ -530,6 +530,8 @@ class StreamingPropertyFiles(PropertyFiles): 
        'payload_properties.txt',

    )

    self.optional = (

        # apex_info.pb isn't directly used in the update flow

        'apex_info.pb',

        # care_map is available only if dm-verity is enabled.

        'care_map.pb',

        'care_map.txt',

tools/releasetools/test_ota_from_target_files.py

+2 −0
Original line number Diff line number Diff line
@@ -863,6 +863,7 @@ class StreamingPropertyFilesTest(PropertyFilesTestCase): 
        property_files.required)

    self.assertEqual(

        (

            'apex_info.pb',

            'care_map.pb',

            'care_map.txt',

            'compatibility.zip',
@@ -962,6 +963,7 @@ class AbOtaPropertyFilesTest(PropertyFilesTestCase): 
        property_files.required)

    self.assertEqual(

        (

            'apex_info.pb',

            'care_map.pb',

            'care_map.txt',

            'compatibility.zip',