Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb78e6bf authored by Paul Trautrim's avatar Paul Trautrim Committed by android-build-merger
Browse files

Merge "Add PRODUCT_BUILD_VBMETA_IMAGE to control vbmeta generation" 

am: 23b46e54

Change-Id: Idc47cbfa3c54faa3656d2df156fef55ba5546ebd
parents 6c3aa71d 23b46e54

core/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -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

core/board_config.mk

+7 −0
Original line number Original line Diff line number Diff line
@@ -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))

core/product.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -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