diff options
| author | Mohamad Ayyash <mkayyash@google.com> | 2015-06-24 15:42:19 -0700 |
|---|---|---|
| committer | Simon Wilson <simonwilson@google.com> | 2015-06-24 16:13:07 -0700 |
| commit | ef5dc90bba179f774bee0c7e479965cef12091de (patch) | |
| tree | 0b652b43af583e0ec25ea75e2374d7c577615574 | |
| parent | 648e40e8660135f37adad5981a48250476c2f3fd (diff) | |
| download | build-ef5dc90bba179f774bee0c7e479965cef12091de.zip build-ef5dc90bba179f774bee0c7e479965cef12091de.tar.gz build-ef5dc90bba179f774bee0c7e479965cef12091de.tar.bz2 | |
Add img2simg in host and ota packages
Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
| -rw-r--r-- | core/Makefile | 3 | ||||
| -rw-r--r-- | core/config.mk | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile index 2b3bdf0..f9b4b9a 100644 --- a/core/Makefile +++ b/core/Makefile @@ -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) \ diff --git a/core/config.mk b/core/config.mk index 7d8c540..cdcc408 100644 --- a/core/config.mk +++ b/core/config.mk @@ -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) |