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

Commit ef5dc90b authored by Mohamad Ayyash's avatar Mohamad Ayyash Committed by Simon Wilson
Browse files

Add img2simg in host and ota packages 



Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa
Signed-off-by: default avatarMohamad Ayyash <mkayyash@google.com>
parent 648e40e8

core/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -702,7 +702,7 @@ INTERNAL_USERIMAGES_DEPS := $(MKYAFFS2) 
endif



ifeq ($(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),squashfs)

INTERNAL_USERIMAGES_DEPS += $(MAKE_SQUASHFS) $(MKSQUASHFSUSERIMG)

INTERNAL_USERIMAGES_DEPS += $(MAKE_SQUASHFS) $(MKSQUASHFSUSERIMG) $(IMG2SIMG)

endif



INTERNAL_USERIMAGES_BINARY_PATHS := $(sort $(dir $(INTERNAL_USERIMAGES_DEPS)))
@@ -1275,6 +1275,7 @@ DISTTOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \ 
	  $(HOST_OUT_EXECUTABLES)/build_verity_tree \

	  $(HOST_OUT_EXECUTABLES)/verity_signer \

	  $(HOST_OUT_EXECUTABLES)/append2simg \

	  $(HOST_OUT_EXECUTABLES)/img2simg \

	  $(HOST_OUT_EXECUTABLES)/boot_signer



OTATOOLS := $(DISTTOOLS) \

core/config.mk

+1 −0
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ MAKE_F2FS := $(HOST_OUT_EXECUTABLES)/make_f2fs$(HOST_EXECUTABLE_SUFFIX) 
MKF2FSUSERIMG := $(HOST_OUT_EXECUTABLES)/mkf2fsuserimg.sh

MKEXT2BOOTIMG := external/genext2fs/mkbootimg_ext2.sh

SIMG2IMG := $(HOST_OUT_EXECUTABLES)/simg2img$(HOST_EXECUTABLE_SUFFIX)

IMG2SIMG := $(HOST_OUT_EXECUTABLES)/img2simg$(HOST_EXECUTABLE_SUFFIX)

E2FSCK := $(HOST_OUT_EXECUTABLES)/e2fsck$(HOST_EXECUTABLE_SUFFIX)

MKTARBALL := build/tools/mktarball.sh

TUNE2FS := $(HOST_OUT_EXECUTABLES)/tune2fs$(HOST_EXECUTABLE_SUFFIX)