From bcc3109262abcc2f1e4b81e79bb33370729fc816 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Fri, 6 Jan 2017 14:24:18 -0800 Subject: [PATCH] Makefile: Pack e2fsdroid into otatools.zip. e2fsdroid is needed to create ext4 images with mke2fs. Also pack both sets of mke2fs and make_ext4fs tools into otatools.zip. Because we use the latest otatools.zip to create OTAs, which needs to handle target_files.zip using either of them. Bug: 34126605 Test: `m otatools-package` and check it has e2fsdroid and make_ext4fs. Test: Use otatools.zip to sign a TF.zip that defines TARGET_USES_MKE2FS={true,false}. Change-Id: I9967e4f078cbe912914c6c511681cba82356ae8e --- core/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/Makefile b/core/Makefile index 143f060c3..cbe9eedc2 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1722,8 +1722,11 @@ OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \ $(HOST_OUT_JAVA_LIBRARIES)/dumpkey.jar \ $(HOST_OUT_JAVA_LIBRARIES)/signapk.jar \ $(HOST_OUT_JAVA_LIBRARIES)/BootSignature.jar \ - $(MAKE_EXT4FS) \ - $(MKEXTUSERIMG) \ + $(HOST_OUT_EXECUTABLES)/make_ext4fs \ + $(HOST_OUT_EXECUTABLES)/mkuserimg.sh \ + $(HOST_OUT_EXECUTABLES)/mke2fs \ + $(HOST_OUT_EXECUTABLES)/mkuserimg_mke2fs.sh \ + $(HOST_OUT_EXECUTABLES)/e2fsdroid \ $(HOST_OUT_EXECUTABLES)/mksquashfsimage.sh \ $(HOST_OUT_EXECUTABLES)/mksquashfs \ $(HOST_OUT_EXECUTABLES)/mkf2fsuserimg.sh \ -- 2.11.0