Merge "Makefile: Add avbtool to INTERNAL_USERIMAGES_DEPS"
am: ccac0f861b
Change-Id: I9e8c86f81543efd95b90f2804ab58a6f8edec695
diff --git a/core/Makefile b/core/Makefile
index 5ead24c..b6a9780 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -866,6 +866,10 @@
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 @@
vbmetaimage-nodeps:
$(build-vbmetaimage-target)
-# We need $(AVBTOOL) for system.img generation.
-FULL_SYSTEMIMAGE_DEPS += $(AVBTOOL)
-
endif # BOARD_AVB_ENABLE
# -----------------------------------------------------------------