gts4lv-common: Move releasetools requirements to android-info-extra.txt

This is a non-standard requirement which fastbootd doesn't nativelly
supports. Move it to the newly introduced file that will only contain
the requirements used by custom releasetools for the OTA assertions.

Change-Id: I1c4128493bb51e3614c721ce1994302a2d6b11f5
This commit is contained in:
Bruno Martins
2023-11-23 20:42:53 +00:00
parent 4d30f33db0
commit ce6ee8b56d
3 changed files with 3 additions and 5 deletions

View File

@@ -62,9 +62,6 @@ BOARD_AVB_RECOVERY_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem
BOARD_AVB_RECOVERY_ROLLBACK_INDEX := 1
BOARD_AVB_RECOVERY_ROLLBACK_INDEX_LOCATION := 1
# Board
TARGET_BOARD_INFO_FILE := $(COMMON_PATH)/board-info.txt
# Bootloader
TARGET_NO_BOOTLOADER := true
TARGET_BOOTLOADER_BOARD_NAME := sdm710
@@ -154,6 +151,7 @@ TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab.qcom
TARGET_RECOVERY_PIXEL_FORMAT := BGRA_8888
# Releasetools
TARGET_ANDROID_INFO_EXTRA_FILE := $(COMMON_PATH)/android-info-extra.txt
TARGET_RECOVERY_UPDATER_LIBS := librecovery_updater_samsung
TARGET_RELEASETOOLS_EXTENSIONS := $(COMMON_PATH)

View File

@@ -1,5 +1,5 @@
#
# Copyright (C) 2019-2022 The LineageOS Project
# Copyright (C) 2019-2023 The LineageOS Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -72,7 +72,7 @@ def AddImage(info, basename, dest):
info.script.AppendExtra('package_extract_file("%s", "%s");' % (basename, dest))
def AddTrustZoneAssertion(info, input_zip):
android_info = info.input_zip.read("OTA/android-info.txt")
android_info = info.input_zip.read("OTA/android-info-extra.txt")
m = re.search(r'require\s+version-trustzone\s*=\s*(\S+)', android_info.decode('utf-8'))
if m:
versions = m.group(1).split('|')