StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move all targets away from non-AB

Browse Source 
This sets AB_OTA_UPDATER to true by default. OEMs can still
override this variable in their board config if their device
is still on non-AB.

Since some targets(e.g. art target) do not need updates,
we permit empty AB_OTA_PARTITIONS if AB_OTA_UPDATER is true.

This reverts commit 2a3faafdbf

Test: th
Bug: 324360816
Change-Id: Ia9e30983ddc7981659d042a177e9edc8abac6a47
This commit is contained in:
Kelvin Zhang
2024-05-16 10:11:31 -07:00
parent 0aeb964be8
commit 1d20ca9f72
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/Makefile
View File

@@ -6132,12 +6132,6 @@ ifeq ($(AB_OTA_UPDATER),true)
$(BUILT_TARGET_FILES_DIR): $(TARGET_OUT_OEM)/$(OSRELEASED_DIRECTORY)/product_version $(BUILT_TARGET_FILES_DIR): $(TARGET_OUT_OEM)/$(OSRELEASED_DIRECTORY)/product_version
$(BUILT_TARGET_FILES_DIR): $(TARGET_OUT_ETC)/$(OSRELEASED_DIRECTORY)/system_version $(BUILT_TARGET_FILES_DIR): $(TARGET_OUT_ETC)/$(OSRELEASED_DIRECTORY)/system_version
endif endif
# Not checking in board_config.mk, since AB_OTA_PARTITIONS may be updated in Android.mk (e.g. to
# additionally include radio or bootloader partitions).
ifeq ($(AB_OTA_PARTITIONS),)
$(error AB_OTA_PARTITIONS must be defined when using AB_OTA_UPDATER)
endif
endif endif
ifneq ($(AB_OTA_PARTITIONS),) ifneq ($(AB_OTA_PARTITIONS),)

4
core/board_config.mk
View File

@@ -923,7 +923,9 @@ endif
########################################### ###########################################
# Ensure consistency among TARGET_RECOVERY_UPDATER_LIBS, AB_OTA_UPDATER, and PRODUCT_OTA_FORCE_NON_AB_PACKAGE. # Ensure consistency among TARGET_RECOVERY_UPDATER_LIBS, AB_OTA_UPDATER, and PRODUCT_OTA_FORCE_NON_AB_PACKAGE.
TARGET_RECOVERY_UPDATER_LIBS ?= TARGET_RECOVERY_UPDATER_LIBS ?=
AB_OTA_UPDATER ?= ifeq ($(AB_OTA_UPDATER),)
AB_OTA_UPDATER := true
endif
.KATI_READONLY := TARGET_RECOVERY_UPDATER_LIBS AB_OTA_UPDATER .KATI_READONLY := TARGET_RECOVERY_UPDATER_LIBS AB_OTA_UPDATER
# Ensure that if PRODUCT_OTA_FORCE_NON_AB_PACKAGE == true, then AB_OTA_UPDATER must be true # Ensure that if PRODUCT_OTA_FORCE_NON_AB_PACKAGE == true, then AB_OTA_UPDATER must be true