Merge "Add img2simg in host and ota packages"
This commit is contained in:
@@ -682,7 +682,7 @@ endif
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),squashfs)
|
ifeq ($(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),squashfs)
|
||||||
INTERNAL_USERIMAGES_DEPS += $(MAKE_SQUASHFS) $(MKSQUASHFSUSERIMG)
|
INTERNAL_USERIMAGES_DEPS += $(MAKE_SQUASHFS) $(MKSQUASHFSUSERIMG) $(IMG2SIMG)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
INTERNAL_USERIMAGES_BINARY_PATHS := $(sort $(dir $(INTERNAL_USERIMAGES_DEPS)))
|
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)/build_verity_tree \
|
||||||
$(HOST_OUT_EXECUTABLES)/verity_signer \
|
$(HOST_OUT_EXECUTABLES)/verity_signer \
|
||||||
$(HOST_OUT_EXECUTABLES)/append2simg \
|
$(HOST_OUT_EXECUTABLES)/append2simg \
|
||||||
|
$(HOST_OUT_EXECUTABLES)/img2simg \
|
||||||
$(HOST_OUT_EXECUTABLES)/boot_signer
|
$(HOST_OUT_EXECUTABLES)/boot_signer
|
||||||
|
|
||||||
# Shared libraries.
|
# Shared libraries.
|
||||||
|
@@ -419,6 +419,7 @@ endif
|
|||||||
MAKE_F2FS := $(HOST_OUT_EXECUTABLES)/make_f2fs$(HOST_EXECUTABLE_SUFFIX)
|
MAKE_F2FS := $(HOST_OUT_EXECUTABLES)/make_f2fs$(HOST_EXECUTABLE_SUFFIX)
|
||||||
MKF2FSUSERIMG := $(HOST_OUT_EXECUTABLES)/mkf2fsuserimg.sh
|
MKF2FSUSERIMG := $(HOST_OUT_EXECUTABLES)/mkf2fsuserimg.sh
|
||||||
SIMG2IMG := $(HOST_OUT_EXECUTABLES)/simg2img$(HOST_EXECUTABLE_SUFFIX)
|
SIMG2IMG := $(HOST_OUT_EXECUTABLES)/simg2img$(HOST_EXECUTABLE_SUFFIX)
|
||||||
|
IMG2SIMG := $(HOST_OUT_EXECUTABLES)/img2simg$(HOST_EXECUTABLE_SUFFIX)
|
||||||
E2FSCK := $(HOST_OUT_EXECUTABLES)/e2fsck$(HOST_EXECUTABLE_SUFFIX)
|
E2FSCK := $(HOST_OUT_EXECUTABLES)/e2fsck$(HOST_EXECUTABLE_SUFFIX)
|
||||||
MKTARBALL := build/tools/mktarball.sh
|
MKTARBALL := build/tools/mktarball.sh
|
||||||
TUNE2FS := $(HOST_OUT_EXECUTABLES)/tune2fs$(HOST_EXECUTABLE_SUFFIX)
|
TUNE2FS := $(HOST_OUT_EXECUTABLES)/tune2fs$(HOST_EXECUTABLE_SUFFIX)
|
||||||
|
Reference in New Issue
Block a user