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

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
This commit is contained in:
Tao Bao 2018-08-22 23:39:03 -07:00
parent ebe17177fe
commit cee6d0456d
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/Makefile
View File

@ -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))