Skip to content

Commit

Permalink
Remove TARGET_USES_MKE2FS
Browse files Browse the repository at this point in the history
Nothing reads TARGET_USES_MKE2FS any more, mke2fs is always used.
Remove the requirement that TARGET_USES_MKE2FS is set, and remove
the places it is set.

Bug: 112241651
Test: m checkbuild
Change-Id: Ibdca062bbe7dcd19ba8f7ee7f8291ce746b74e65
  • Loading branch information
colincross authored and haggertk committed Feb 24, 2019
1 parent 1a46559 commit b77d71c
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 7 deletions.
5 changes: 0 additions & 5 deletions core/config.mk
Original file line number Diff line number Diff line change
Expand Up @@ -866,11 +866,6 @@ endif


ifdef PRODUCT_SHIPPING_API_LEVEL
ifneq ($(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),27),)
ifneq ($(TARGET_USES_MKE2FS),true)
$(error When PRODUCT_SHIPPING_API_LEVEL >= 27, TARGET_USES_MKE2FS must be true)
endif
endif
ifneq ($(call numbers_less_than,$(PRODUCT_SHIPPING_API_LEVEL),$(BOARD_SYSTEMSDK_VERSIONS)),)
$(error BOARD_SYSTEMSDK_VERSIONS ($(BOARD_SYSTEMSDK_VERSIONS)) must all be greater than or equal to PRODUCT_SHIPPING_API_LEVEL ($(PRODUCT_SHIPPING_API_LEVEL)))
endif
Expand Down
1 change: 0 additions & 1 deletion target/board/BoardConfigGsiCommon.mk
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ TARGET_USERIMAGES_USE_EXT4 := true
# Some vendors' bootloaders don't work properly with raw format images. So
# we explicit specify this need below (even though it's the current default).
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false
TARGET_USES_MKE2FS := true

# Enable dyanmic system image size and reserved 64MB in it.
BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864
Expand Down
1 change: 0 additions & 1 deletion target/board/treble_common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ TARGET_NO_KERNEL := true
TARGET_USERIMAGES_USE_EXT4 := true
TARGET_USERIMAGES_USE_F2FS := true
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false
TARGET_USES_MKE2FS := true

# Enable dyanmic system image size and reserved 64MB in it.
BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864
Expand Down

0 comments on commit b77d71c

Please sign in to comment.