commit 8b92dab12680b329d6863abcdee650ec3bb11519
author Tianjie Xu <xunchang@google.com> Tue Jun 29 23:58:47 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 29 23:58:47 2021 +0000
tree f00adc9089f491bcf526bb402389a70875fddbcd
parent 389f5afb83f0f3dccafc0f9911430406b6e0dea2
parent d868c12467780374304cdf5777de424336c58eb8

Merge "Add apex info to the streaming property file"

tools/releasetools/ota_from_target_files.py

diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py
index bf0b8f1..8face66 100755
--- a/tools/releasetools/ota_from_target_files.py
+++ b/tools/releasetools/ota_from_target_files.py
@@ -530,6 +530,8 @@
         '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

diff --git a/tools/releasetools/test_ota_from_target_files.py b/tools/releasetools/test_ota_from_target_files.py
index 51def30..11cfee1 100644
--- a/tools/releasetools/test_ota_from_target_files.py
+++ b/tools/releasetools/test_ota_from_target_files.py
@@ -863,6 +863,7 @@
         property_files.required)
     self.assertEqual(
         (
+            'apex_info.pb',
             'care_map.pb',
             'care_map.txt',
             'compatibility.zip',
@@ -962,6 +963,7 @@
         property_files.required)
     self.assertEqual(
         (
+            'apex_info.pb',
             'care_map.pb',
             'care_map.txt',
             'compatibility.zip',