tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "TARGET_RECOVERY_UPDATER_LIBS should not be used with AB updates" am: 81648927fb am: ce324c6848 am: cb43c0f8db

Browse source 
am: c1e617618e

Change-Id: I263bce77a6e52925f356344dfee437c6379d7e82
This commit is contained in:
Dan Willemsen 2017-01-05 22:58:45 +00:00 committed by android-build-merger
commit b1be1db324
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/envsetup.mk
View file

@ -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.