From 9764892031cd48013cecda4d6eb77631463a3d86 Mon Sep 17 00:00:00 2001 From: Mohamad Ayyash Date: Wed, 24 Jun 2015 15:42:19 -0700 Subject: [PATCH] Add img2simg in host and ota packages Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa Signed-off-by: Mohamad Ayyash --- core/Makefile | 3 ++- core/config.mk | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index f0b1d56c6f..449de8daf1 100644 --- a/core/Makefile +++ b/core/Makefile @@ -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. diff --git a/core/config.mk b/core/config.mk index 83295d9be1..1a15186fe4 100644 --- a/core/config.mk +++ b/core/config.mk @@ -403,6 +403,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)