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

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

Change-Id: I5f35f44b4628b5d3b2e998faa7614d1268ca042b

tools/releasetools/ota_from_target_files.py

@@ -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

@@ -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',