Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abd4388b authored by Chris Fries's avatar Chris Fries Committed by android-build-merger
Browse files

Merge "Makefile: Add avbtool to INTERNAL_USERIMAGES_DEPS" am: ccac0f86 

am: ba0be935

Change-Id: I1b6a9b8f05d10738267a51da65bd404242885e6c
parents 38e8c8bc ba0be935

core/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -922,6 +922,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
@@ -1996,9 +2000,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



# -----------------------------------------------------------------