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

Commit e3190bfd authored by Kelvin Zhang's avatar Kelvin Zhang Committed by Gerrit Code Review
Browse files

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

parents 8bbae756 2ddbfee4

core/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -6109,6 +6109,12 @@ 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),)

core/board_config.mk

+1 −3
Original line number Diff line number Diff line
@@ -923,9 +923,7 @@ endif 
###########################################

# Ensure consistency among TARGET_RECOVERY_UPDATER_LIBS, AB_OTA_UPDATER, and PRODUCT_OTA_FORCE_NON_AB_PACKAGE.

TARGET_RECOVERY_UPDATER_LIBS ?=

ifeq ($(AB_OTA_UPDATER),)

AB_OTA_UPDATER := true

endif

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