diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-07-10 00:58:53 -0700 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2015-10-27 00:45:16 +0200 |
| commit | 61af5631813226e99c31a194a5730b7557ec4505 (patch) | |
| tree | a457e4ad02571dae934666631bb295b3db4512ae /core/Makefile | |
| parent | b9e27f83cb4be1969b4cb077f0164298c72cb89c (diff) | |
| download | build-61af5631813226e99c31a194a5730b7557ec4505.zip build-61af5631813226e99c31a194a5730b7557ec4505.tar.gz build-61af5631813226e99c31a194a5730b7557ec4505.tar.bz2 | |
build: Fix image creation for F2FS-only configuration
* Add f2fs dependencies regardless of whether we're building ext4
images or not.
Change-Id: I886c52edaf56eb96fb931384440f33b00aa5c9ec
Diffstat (limited to 'core/Makefile')
| -rw-r--r-- | core/Makefile | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/core/Makefile b/core/Makefile index a3a6bfd..b80a47f 100644 --- a/core/Makefile +++ b/core/Makefile @@ -729,6 +729,12 @@ INTERNAL_USERIMAGES_EXT_VARIANT := ext4 endif endif endif +ifeq ($(TARGET_USERIMAGES_USE_F2FS),true) +INTERNAL_USERIMAGES_USE_F2FS := true +ifeq ($(INTERNAL_USERIMAGES_EXT_VARIANT),) +INTERNAL_USERIMAGES_EXT_VARIANT := f2fs +endif +endif # These options tell the recovery updater/installer how to mount the partitions writebale. # <fstype>=<fstype_opts>[|<fstype_opts>]... @@ -741,12 +747,12 @@ ifneq (true,$(TARGET_USERIMAGES_SPARSE_EXT_DISABLED)) INTERNAL_USERIMAGES_SPARSE_EXT_FLAG := -s endif +INTERNAL_USERIMAGES_DEPS := ifeq ($(INTERNAL_USERIMAGES_USE_EXT),true) -INTERNAL_USERIMAGES_DEPS := $(SIMG2IMG) INTERNAL_USERIMAGES_DEPS += $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(E2FSCK) -ifeq ($(TARGET_USERIMAGES_USE_F2FS),true) -INTERNAL_USERIMAGES_DEPS += $(MKF2FSUSERIMG) $(MAKE_F2FS) endif +ifeq ($(INTERNAL_USERIMAGES_USE_F2FS),true) +INTERNAL_USERIMAGES_DEPS += $(MKF2FSUSERIMG) $(MAKE_F2FS) endif ifeq ($(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),squashfs) @@ -757,6 +763,8 @@ ifeq ($(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),squashfs) INTERNAL_USERIMAGES_DEPS += $(MAKE_SQUASHFS) $(MKSQUASHFSUSERIMG) $(IMG2SIMG) endif +INTERNAL_USERIMAGES_DEPS += $(SIMG2IMG) + INTERNAL_USERIMAGES_BINARY_PATHS := $(sort $(dir $(INTERNAL_USERIMAGES_DEPS))) ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY)) |