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

Merge "Add PRODUCT_BUILD_VBMETA_IMAGE to control vbmeta generation"

This commit is contained in:
Paul Trautrim 2019-08-20 00:07:35 +00:00 committed by Gerrit Code Review
parent cc875c1482 4e14323a31
commit 23b46e54ac
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/Makefile
View File

@ -3396,6 +3396,7 @@ define build-vbmetaimage-target
$(hide) rm -rf $(AVB_CHAIN_KEY_DIR)
endef
ifdef BUILDING_VBMETA_IMAGE
INSTALLED_VBMETAIMAGE_TARGET := $(BUILT_VBMETAIMAGE_TARGET)
$(INSTALLED_VBMETAIMAGE_TARGET): PRIVATE_AVB_VBMETA_SIGNING_ARGS := \
--algorithm $(BOARD_AVB_ALGORITHM) --key $(BOARD_AVB_KEY_PATH)
@ -3420,6 +3421,7 @@ $(INSTALLED_VBMETAIMAGE_TARGET): \
.PHONY: vbmetaimage-nodeps
vbmetaimage-nodeps:
$(build-vbmetaimage-target)
endif # BUILDING_VBMETA_IMAGE
endif # BOARD_AVB_ENABLE

7
core/board_config.mk
View File

@ -358,6 +358,13 @@ else ifeq ($(PRODUCT_BUILD_USERDATA_IMAGE),true)
endif
.KATI_READONLY := BUILDING_USERDATA_IMAGE
# Are we building a vbmeta image
BUILDING_VBMETA_IMAGE := true
ifeq ($(PRODUCT_BUILD_VBMETA_IMAGE),false)
BUILDING_VBMETA_IMAGE :=
endif
.KATI_READONLY := BUILDING_VBMETA_IMAGE
###########################################
# Now we can substitute with the real value of TARGET_COPY_OUT_VENDOR
ifeq ($(TARGET_COPY_OUT_VENDOR),$(_vendor_path_placeholder))

1
core/product.mk
View File

@ -362,6 +362,7 @@ _product_single_value_vars += PRODUCT_BUILD_RAMDISK_IMAGE
_product_single_value_vars += PRODUCT_BUILD_USERDATA_IMAGE
_product_single_value_vars += PRODUCT_BUILD_RECOVERY_IMAGE
_product_single_value_vars += PRODUCT_BUILD_BOOT_IMAGE
_product_single_value_vars += PRODUCT_BUILD_VBMETA_IMAGE
_product_list_vars += PRODUCT_UPDATABLE_BOOT_MODULES
_product_list_vars += PRODUCT_UPDATABLE_BOOT_LOCATIONS