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

Commit cee6d045 authored by Tao Bao's avatar Tao Bao
Browse files

Add the missing rule for including product_services.img into vbmeta.img. 

Bug: 80741439
Test: `m -j vbmetaimage` for a target that uses product_services image
      (i.e. `BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE := ext4`).
      Verify that the generated `vbmeta.img` includes the descriptor for
      `product_services.img`.
Change-Id: Ia2d64523319c3313803acbc63dd56154a0426334
parent ebe17177

core/Makefile

+9 −0
Original line number Diff line number Diff line
@@ -2669,6 +2669,15 @@ INTERNAL_AVB_MAKE_VBMETA_IMAGE_ARGS += \ 
endif

endif



ifdef INSTALLED_PRODUCT_SERVICESIMAGE_TARGET

ifdef BOARD_AVB_PRODUCT_SERVICES_KEY_PATH

$(eval $(call check-and-set-avb-chain-args,PRODUCT_SERVICES))

else

INTERNAL_AVB_MAKE_VBMETA_IMAGE_ARGS += \

    --include_descriptors_from_image $(INSTALLED_PRODUCT_SERVICESIMAGE_TARGET)

endif

endif



ifdef INSTALLED_ODMIMAGE_TARGET

ifdef BOARD_AVB_ODM_KEY_PATH

$(eval $(call check-and-set-avb-chain-args,ODM))