p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "TARGET_RECOVERY_UPDATER_LIBS should not be used with AB updates" 

am: 81648927fb

Change-Id: I34c35cdd94e2251109275de38520b7059529ee5a
This commit is contained in:
Dan Willemsen 2017-01-05 22:48:11 +00:00 committed by android-build-merger
parent 2fe7f7a402 81648927fb
commit ce324c6848
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

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