Merge "Makefile: Add avbtool to INTERNAL_USERIMAGES_DEPS"

am: ccac0f861b

Change-Id: I9e8c86f81543efd95b90f2804ab58a6f8edec695
This commit is contained in:
Chris Fries 2017-06-21 23:13:43 +00:00 committed by android-build-merger
commit ba0be93555

View file

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