Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ee99853 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Inline some variables that are only used in 1 place" am: a2ed2629 

Original change: https://android-review.googlesource.com/c/platform/build/+/2128120



Change-Id: If273bb421d223269f6e4e40bf57a2b9548bb94c3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 449fa2be a2ed2629

core/Makefile

+8 −31
Original line number Diff line number Diff line
@@ -1705,19 +1705,6 @@ $(eval $(call copy-one-file,$(BUILD_SYSTEM)/WINPTHREADS_COPYING,$(winpthreads_no 
# Targets for user images

# #################################################################



INTERNAL_USERIMAGES_EXT_VARIANT :=

ifeq ($(TARGET_USERIMAGES_USE_EXT2),true)

INTERNAL_USERIMAGES_EXT_VARIANT := ext2

else

ifeq ($(TARGET_USERIMAGES_USE_EXT3),true)

INTERNAL_USERIMAGES_EXT_VARIANT := ext3

else

ifeq ($(TARGET_USERIMAGES_USE_EXT4),true)

INTERNAL_USERIMAGES_EXT_VARIANT := ext4

endif

endif

endif



# These options tell the recovery updater/installer how to mount the partitions writebale.

# <fstype>=<fstype_opts>[|<fstype_opts>]...

# fstype_opts := <opt>[,<opt>]...
@@ -1725,19 +1712,6 @@ endif 
# The following worked on Nexus devices with Kernel 3.1, 3.4, 3.10

DEFAULT_TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS := ext4=max_batch_time=0,commit=1,data=ordered,barrier=1,errors=panic,nodelalloc



ifneq (true,$(TARGET_USERIMAGES_SPARSE_EXT_DISABLED))

  INTERNAL_USERIMAGES_SPARSE_EXT_FLAG := -s

endif

ifneq (true,$(TARGET_USERIMAGES_SPARSE_EROFS_DISABLED))

  INTERNAL_USERIMAGES_SPARSE_EROFS_FLAG := -s

endif

ifneq (true,$(TARGET_USERIMAGES_SPARSE_SQUASHFS_DISABLED))

  INTERNAL_USERIMAGES_SPARSE_SQUASHFS_FLAG := -s

endif

ifneq (true,$(TARGET_USERIMAGES_SPARSE_F2FS_DISABLED))

  INTERNAL_USERIMAGES_SPARSE_F2FS_FLAG := -S

endif



INTERNAL_USERIMAGES_DEPS := \

    $(BUILD_IMAGE) \

    $(MKE2FS_CONF) \
@@ -1904,11 +1878,14 @@ $(if $(filter $(2),oem),\ 
)

$(hide) echo "ext_mkuserimg=$(notdir $(MKEXTUSERIMG))" >> $(1)



$(if $(INTERNAL_USERIMAGES_EXT_VARIANT),$(hide) echo "fs_type=$(INTERNAL_USERIMAGES_EXT_VARIANT)" >> $(1))

$(if $(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG),$(hide) echo "extfs_sparse_flag=$(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG)" >> $(1))

$(if $(INTERNAL_USERIMAGES_SPARSE_EROFS_FLAG),$(hide) echo "erofs_sparse_flag=$(INTERNAL_USERIMAGES_SPARSE_EROFS_FLAG)" >> $(1))

$(if $(INTERNAL_USERIMAGES_SPARSE_SQUASHFS_FLAG),$(hide) echo "squashfs_sparse_flag=$(INTERNAL_USERIMAGES_SPARSE_SQUASHFS_FLAG)" >> $(1))

$(if $(INTERNAL_USERIMAGES_SPARSE_F2FS_FLAG),$(hide) echo "f2fs_sparse_flag=$(INTERNAL_USERIMAGES_SPARSE_F2FS_FLAG)" >> $(1))

$(if $(filter true,$(TARGET_USERIMAGES_USE_EXT2)),$(hide) echo "fs_type=ext2" >> $(1),

  $(if $(filter true,$(TARGET_USERIMAGES_USE_EXT3)),$(hide) echo "fs_type=ext3" >> $(1),

    $(if $(filter true,$(TARGET_USERIMAGES_USE_EXT4)),$(hide) echo "fs_type=ext4" >> $(1))))



$(if $(filter true,$(TARGET_USERIMAGES_SPARSE_EXT_DISABLED)),,$(hide) echo "extfs_sparse_flag=-s" >> $(1))

$(if $(filter true,$(TARGET_USERIMAGES_SPARSE_EROFS_DISABLED)),,$(hide) echo "erofs_sparse_flag=-s" >> $(1))

$(if $(filter true,$(TARGET_USERIMAGES_SPARSE_SQUASHFS_DISABLED)),,$(hide) echo "squashfs_sparse_flag=-s" >> $(1))

$(if $(filter true,$(TARGET_USERIMAGES_SPARSE_F2FS_DISABLED)),,$(hide) echo "f2fs_sparse_flag=-S" >> $(1))

$(if $(BOARD_EROFS_COMPRESSOR),$(hide) echo "erofs_default_compressor=$(BOARD_EROFS_COMPRESSOR)" >> $(1))

$(if $(BOARD_EROFS_COMPRESS_HINTS),$(hide) echo "erofs_default_compress_hints=$(BOARD_EROFS_COMPRESS_HINTS)" >> $(1))

$(if $(BOARD_EROFS_PCLUSTER_SIZE),$(hide) echo "erofs_pcluster_size=$(BOARD_EROFS_PCLUSTER_SIZE)" >> $(1))