Merge "Makefile: Add avbtool to INTERNAL_USERIMAGES_DEPS" (ccac0f86) · Commits · e / os / android_build

core/Makefile

+4 −3

Original line number	Diff line number	Diff line
		@@ -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

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