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

Commit 745bb814 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Reland Move all targets away from non-AB" into main am: cd23871b 

Original change: https://android-review.googlesource.com/c/platform/build/+/3149076



Change-Id: Iff8547ef561374c925fb22ea24bdb44e17c0d2c3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5f3e93d4 cd23871b

core/Makefile

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

core/board_config.mk

+3 −1
Original line number Diff line number Diff line
@@ -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