Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 649d91d7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "updater_sample: tools: import AbOtaPropertyFiles from ota_utils" into... 

Merge "updater_sample: tools: import AbOtaPropertyFiles from ota_utils" into main am: c117b7e4 am: 2caa07b8 am: 138bb18f

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



Change-Id: I8f19ff581dabbac7a6b2b4873ce861c22bcc0a81
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1b0f7acd 138bb18f

updater_sample/tools/gen_update_config.py

+2 −2
Original line number Diff line number Diff line
@@ -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(','):