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" am: 23b46e54ac 

am: bb78e6bfb8

Change-Id: I5928cc2d7c1620fee5750a026f10912af4899be4
This commit is contained in:
Paul Trautrim 2019-08-19 17:53:41 -07:00 committed by android-build-merger
parent 0621e17353 bb78e6bfb8
commit bbcbababe7
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

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

7
core/board_config.mk
View File

@ -358,6 +358,13 @@ else ifeq ($(PRODUCT_BUILD_USERDATA_IMAGE),true)
endif endif
.KATI_READONLY := BUILDING_USERDATA_IMAGE .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 # Now we can substitute with the real value of TARGET_COPY_OUT_VENDOR
ifeq ($(TARGET_COPY_OUT_VENDOR),$(_vendor_path_placeholder)) 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_USERDATA_IMAGE
_product_single_value_vars += PRODUCT_BUILD_RECOVERY_IMAGE _product_single_value_vars += PRODUCT_BUILD_RECOVERY_IMAGE
_product_single_value_vars += PRODUCT_BUILD_BOOT_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_MODULES
_product_list_vars += PRODUCT_UPDATABLE_BOOT_LOCATIONS _product_list_vars += PRODUCT_UPDATABLE_BOOT_LOCATIONS