Merge "updater_sample: tools: import AbOtaPropertyFiles from ota_utils" into main am: c117b7e495 am: 2caa07b8f4

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2837717

Change-Id: I4f7c90538855b4821fbe7f73836381c93b20d1ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-12-13 21:44:25 +00:00 committed by Automerger Merge Worker
commit 138bb18f3b

View file

@ -32,7 +32,7 @@ import os.path
import sys
import zipfile
import ota_from_target_files # pylint: disable=import-error
import ota_utils # pylint: disable=import-error
class GenUpdateConfig(object):
@ -100,7 +100,7 @@ class GenUpdateConfig(object):
def _get_property_files(package_zip):
"""Constructs the property-files list for A/B streaming metadata."""
ab_ota = ota_from_target_files.AbOtaPropertyFiles()
ab_ota = ota_utils.AbOtaPropertyFiles()
property_str = ab_ota.GetPropertyFilesString(package_zip, False)
property_files = []
for file in property_str.split(','):