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

Merge "Move all targets away from non-AB" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-06-25 23:33:31 +00:00
committed by Gerrit Code Review
parent f8b7517b02 1d20ca9f72
commit 8bbae75626
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

@@ -6109,12 +6109,6 @@ ifeq ($(AB_OTA_UPDATER),true)
$(BUILT_TARGET_FILES_DIR): $(TARGET_OUT_OEM)/$(OSRELEASED_DIRECTORY)/product_version
$(BUILT_TARGET_FILES_DIR): $(TARGET_OUT_ETC)/$(OSRELEASED_DIRECTORY)/system_version
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
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.
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
# Ensure that if PRODUCT_OTA_FORCE_NON_AB_PACKAGE == true, then AB_OTA_UPDATER must be true