Always package ext filesystem tools
Every target we have needs these now. Test: treehugger; codesearch Change-Id: I6ab7e48887b19f956b2a7aeac78169f0e2035c73
This commit is contained in:
parent
7cda7650da
commit
df0808331d
|
@ -1224,15 +1224,12 @@ otacerts: $(TARGET_OUT_ETC)/security/otacerts.zip
|
|||
|
||||
INTERNAL_USERIMAGES_EXT_VARIANT :=
|
||||
ifeq ($(TARGET_USERIMAGES_USE_EXT2),true)
|
||||
INTERNAL_USERIMAGES_USE_EXT := true
|
||||
INTERNAL_USERIMAGES_EXT_VARIANT := ext2
|
||||
else
|
||||
ifeq ($(TARGET_USERIMAGES_USE_EXT3),true)
|
||||
INTERNAL_USERIMAGES_USE_EXT := true
|
||||
INTERNAL_USERIMAGES_EXT_VARIANT := ext3
|
||||
else
|
||||
ifeq ($(TARGET_USERIMAGES_USE_EXT4),true)
|
||||
INTERNAL_USERIMAGES_USE_EXT := true
|
||||
INTERNAL_USERIMAGES_EXT_VARIANT := ext4
|
||||
endif
|
||||
endif
|
||||
|
@ -1249,13 +1246,11 @@ ifneq (true,$(TARGET_USERIMAGES_SPARSE_EXT_DISABLED))
|
|||
INTERNAL_USERIMAGES_SPARSE_EXT_FLAG := -s
|
||||
endif
|
||||
|
||||
ifeq ($(INTERNAL_USERIMAGES_USE_EXT),true)
|
||||
INTERNAL_USERIMAGES_DEPS := $(SIMG2IMG)
|
||||
INTERNAL_USERIMAGES_DEPS += $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(E2FSCK) $(TUNE2FS)
|
||||
ifeq ($(TARGET_USERIMAGES_USE_F2FS),true)
|
||||
INTERNAL_USERIMAGES_DEPS += $(MKF2FSUSERIMG) $(MAKE_F2FS)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BOARD_AVB_ENABLE),true)
|
||||
INTERNAL_USERIMAGES_DEPS += $(AVBTOOL)
|
||||
|
@ -1282,9 +1277,7 @@ INTERNAL_USERIMAGES_DEPS += $(SELINUX_FC)
|
|||
|
||||
INTERNAL_USERIMAGES_DEPS += $(BLK_ALLOC_TO_BASE_FS)
|
||||
|
||||
ifeq ($(INTERNAL_USERIMAGES_USE_EXT),true)
|
||||
INTERNAL_USERIMAGES_DEPS += $(MKE2FS_CONF)
|
||||
endif
|
||||
|
||||
ifeq (true,$(PRODUCT_USE_DYNAMIC_PARTITIONS))
|
||||
|
||||
|
|
Loading…
Reference in New Issue