From df0387ddab5b141b9a49b5c6ddafd86c11a6fd31 Mon Sep 17 00:00:00 2001 From: Chris Fries Date: Wed, 21 Jun 2017 15:51:46 -0500 Subject: [PATCH] Makefile: Add avbtool to INTERNAL_USERIMAGES_DEPS .. in order to let the system_other image use it. Bug: 33203383 Can't build target on mac Change-Id: Iac2faf0ebdcc933675afbec2301d5d455aa33501 --- core/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/Makefile b/core/Makefile index 5ead24cfc..b6a978051 100644 --- a/core/Makefile +++ b/core/Makefile @@ -866,6 +866,10 @@ INTERNAL_USERIMAGES_DEPS += $(MKF2FSUSERIMG) $(MAKE_F2FS) endif endif +ifeq ($(BOARD_AVB_ENABLE),true) +INTERNAL_USERIMAGES_DEPS += $(AVBTOOL) +endif + ifneq (true,$(TARGET_USERIMAGES_SPARSE_SQUASHFS_DISABLED)) INTERNAL_USERIMAGES_SPARSE_SQUASHFS_FLAG := -s endif @@ -1926,9 +1930,6 @@ $(INSTALLED_VBMETAIMAGE_TARGET): $(AVBTOOL) $(INSTALLED_BOOTIMAGE_TARGET) $(INST vbmetaimage-nodeps: $(build-vbmetaimage-target) -# We need $(AVBTOOL) for system.img generation. -FULL_SYSTEMIMAGE_DEPS += $(AVBTOOL) - endif # BOARD_AVB_ENABLE # -----------------------------------------------------------------