bootable/newinstaller
| Revision | 716038aff3a0d5a1902c0ee11e058439890e3d68 (tree) |
|---|---|
| Time | 2016-06-01 00:00:02 |
| Author | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Android.mk: use AOSP's mksquashfs
Build mksquashfs from the source of AOSP.
Android.mk (diff)| @@ -27,12 +27,10 @@ VER ?= $(shell date +"%F") | ||
| 27 | 27 | |
| 28 | 28 | # use squashfs for iso, unless explictly disabled |
| 29 | 29 | ifneq ($(USE_SQUASHFS),0) |
| 30 | -MKSQUASHFS = $(shell which mksquashfs) | |
| 30 | +MKSQUASHFS := $(MAKE_SQUASHFS) | |
| 31 | 31 | |
| 32 | 32 | define build-squashfs-target |
| 33 | - $(if $(shell $(MKSQUASHFS) -version | grep "version [0-3].[0-9]"),\ | |
| 34 | - $(error Your mksquashfs is too old to work with kernel 2.6.29. Please upgrade to squashfs-tools 4.0)) | |
| 35 | - $(hide) $(MKSQUASHFS) $(1) $(2) -noappend | |
| 33 | + $(hide) $(MKSQUASHFS) $(1) $(2) -noappend -comp gzip | |
| 36 | 34 | endef |
| 37 | 35 | endif |
| 38 | 36 |
| @@ -42,6 +40,7 @@ initrd_bin := \ | ||
| 42 | 40 | $(wildcard $(initrd_dir)/*/*) |
| 43 | 41 | |
| 44 | 42 | systemimg := $(PRODUCT_OUT)/system.$(if $(MKSQUASHFS),sfs,img) |
| 43 | +$(if $(MKSQUASHFS),$(systemimg): | $(MKSQUASHFS)) | |
| 45 | 44 | |
| 46 | 45 | INITRD_RAMDISK := $(PRODUCT_OUT)/initrd.img |
| 47 | 46 | $(INITRD_RAMDISK): $(initrd_bin) $(systemimg) $(TARGET_INITRD_SCRIPTS) | $(ACP) $(MKBOOTFS) |
Fork