Merge "Enforce the consistency between AB_OTA_UPDATER and AB_OTA_PARTITIONS."

This commit is contained in:
Tao Bao 2019-10-07 19:06:46 +00:00 committed by Gerrit Code Review
commit e3c95f71e7
1 changed files with 12 additions and 0 deletions

View File

@ -4035,6 +4035,18 @@ ifeq ($(AB_OTA_UPDATER),true)
$(BUILT_TARGET_FILES_PACKAGE): $(TARGET_OUT_OEM)/$(OSRELEASED_DIRECTORY)/product_version
$(BUILT_TARGET_FILES_PACKAGE): $(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),)
ifneq ($(AB_OTA_UPDATER),true)
$(error AB_OTA_UPDATER must be true when defining AB_OTA_PARTITIONS)
endif
endif
# Run fs_config while creating the target files package