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

Commit 19cfe7db authored by Mohamad Ayyash's avatar Mohamad Ayyash Committed by Gerrit Code Review
Browse files

Merge "Add img2simg in host and ota packages"

parents 042e8519 97648920

core/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ endif 
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)))
@@ -1267,6 +1267,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



# Shared libraries.

core/config.mk

+1 −0
Original line number Diff line number Diff line
@@ -419,6 +419,7 @@ endif 
MAKE_F2FS := $(HOST_OUT_EXECUTABLES)/make_f2fs$(HOST_EXECUTABLE_SUFFIX)

MKF2FSUSERIMG := $(HOST_OUT_EXECUTABLES)/mkf2fsuserimg.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)