From d868c12467780374304cdf5777de424336c58eb8 Mon Sep 17 00:00:00 2001 From: Tianjie Date: Mon, 7 Jun 2021 16:11:47 -0700 Subject: [PATCH] Add apex info to the streaming property file So updaters can streaming download the file, and query the apex info inside the file. Bug: 190244686 Test: generate an OTA package, check the streaming property Change-Id: I17078d3f8d60ca53c6afe82f74b232e2fb242467 --- tools/releasetools/ota_from_target_files.py | 2 ++ tools/releasetools/test_ota_from_target_files.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index 0b8965c273..849679edfb 100755 --- a/tools/releasetools/ota_from_target_files.py +++ b/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', diff --git a/tools/releasetools/test_ota_from_target_files.py b/tools/releasetools/test_ota_from_target_files.py index 51def30629..11cfee185a 100644 --- a/tools/releasetools/test_ota_from_target_files.py +++ b/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',