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

Commit 00cf7676 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

TARGET_RECOVERY_UPDATER_LIBS should not be used with AB updates 

Also mark these variables as readonly so that later Android.mk cannot
change them.

Bug: 33607778
Test: build/tools/kati_all_products.sh -j12
Change-Id: I5f9a4df02bfdfd56549728f074bbb3fc251edb3d
parent 1a4a0a45

core/envsetup.mk

+9 −1
Original line number Diff line number Diff line
@@ -188,7 +188,15 @@ else ifdef BOARD_USES_VENDORIMAGE 
$(error TARGET_COPY_OUT_VENDOR must be set to 'vendor' to use a vendor image)

endif

###########################################



# Ensure that only TARGET_RECOVERY_UPDATER_LIBS *or* AB_OTA_UPDATER is set.

TARGET_RECOVERY_UPDATER_LIBS ?=

AB_OTA_UPDATER ?=

.KATI_READONLY := TARGET_RECOVERY_UPDATER_LIBS AB_OTA_UPDATER

ifeq ($(AB_OTA_UPDATER),true)

  ifneq ($(strip $(TARGET_RECOVERY_UPDATER_LIBS)),)

    $(error Do not use TARGET_RECOVERY_UPDATER_LIBS when using AB_OTA_UPDATER)

  endif

endif



# ---------------------------------------------------------------

# Set up configuration for target machine.