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

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

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

Change-Id: Ie028c42744df4aaf8c94caebd0d3f9484e8297ff
This commit is contained in:
Tianjie Xu
2021-06-30 00:13:16 +00:00
committed by Automerger Merge Worker
parent 0982fa8193 8b92dab126
commit 7af4876c8d
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/releasetools/ota_from_target_files.py
View File

@@ -530,6 +530,8 @@ class StreamingPropertyFiles(PropertyFiles):
'payload_properties.txt', 'payload_properties.txt',
) )
self.optional = ( 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 is available only if dm-verity is enabled.
'care_map.pb', 'care_map.pb',
'care_map.txt', 'care_map.txt',

2
tools/releasetools/test_ota_from_target_files.py
View File

@@ -863,6 +863,7 @@ class StreamingPropertyFilesTest(PropertyFilesTestCase):
property_files.required) property_files.required)
self.assertEqual( self.assertEqual(
( (
'apex_info.pb',
'care_map.pb', 'care_map.pb',
'care_map.txt', 'care_map.txt',
'compatibility.zip', 'compatibility.zip',
@@ -962,6 +963,7 @@ class AbOtaPropertyFilesTest(PropertyFilesTestCase):
property_files.required) property_files.required)
self.assertEqual( self.assertEqual(
( (
'apex_info.pb',
'care_map.pb', 'care_map.pb',
'care_map.txt', 'care_map.txt',
'compatibility.zip', 'compatibility.zip',