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

Merge "Enforce the consistency between AB_OTA_UPDATER and AB_OTA_PARTITIONS." 

am: e3c95f71e7

Change-Id: Id19d9ed15cea91022d2693ab8ffa01a989b1ffaa
This commit is contained in:
Tao Bao 2019-10-07 12:28:52 -07:00 committed by android-build-merger
parent fa4ea59837 e3c95f71e7
commit 34bd354511
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/Makefile
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