commit 2f2b5bb224d47cab5a7909c076339ce119689058
author Treehugger Robot <treehugger-gerrit@google.com> Fri Aug 24 16:51:23 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 24 16:51:23 2018 +0000
tree 0e8ed4e1e2fa987af79c51413659c915a281ca1c
parent 916f710b96c26baf535555bfca4533950ff68f26
parent cee6d0456d8d3857d65b3781aad356d075eee248

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

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index f11e3a6..7a6c9fc 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2669,6 +2669,15 @@
 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))