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

Commit b1be1db3 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "TARGET_RECOVERY_UPDATER_LIBS should not be used with AB updates" am:... 

Merge "TARGET_RECOVERY_UPDATER_LIBS should not be used with AB updates" am: 81648927 am: ce324c68 am: cb43c0f8
am: c1e61761

Change-Id: I263bce77a6e52925f356344dfee437c6379d7e82
parents 19aabae0 c1e61761

core/envsetup.mk

+9 −1
Original line number Diff line number Diff line
@@ -193,7 +193,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.