commit 19cfe7db4ce414ce36c973fe90e94afa898194d6
author Mohamad Ayyash <mkayyash@google.com> Thu Jun 25 18:44:02 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 25 18:44:03 2015 +0000
tree 14c8129de4b6f7e223933ed4d8433759c4dba8bc
parent 042e851999a73fd14cd612b9c934ab2b2f308b75
parent 9764892031cd48013cecda4d6eb77631463a3d86

Merge "Add img2simg in host and ota packages"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 65b4f18..63ef434 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -682,7 +682,7 @@
 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 @@
   $(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

diff --git a/core/config.mk b/core/config.mk
index 07c392a..88a1bcb 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -419,6 +419,7 @@
 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)