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

Commit 54c5e5b1 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 1b8c01db: Merge "Product-configurable sparse ext images." 

* commit '1b8c01db':
  Product-configurable sparse ext images.
parents 098826bf 1b8c01db

core/Makefile

+10 −3
Original line number Diff line number Diff line
@@ -566,8 +566,12 @@ endif 
endif

endif



ifneq (true,$(TARGET_USERIMAGES_SPARSE_EXT_DISABLED))

  INTERNAL_USERIMAGES_SPARSE_EXT_FLAG := -s

endif



ifeq ($(INTERNAL_USERIMAGES_USE_EXT),true)

INTERNAL_USERIMAGES_DEPS := $(MKEXT2USERIMG) $(MAKE_EXT4FS)

INTERNAL_USERIMAGES_DEPS := $(MKEXTUSERIMG) $(MAKE_EXT4FS)

INTERNAL_USERIMAGES_BINARY_PATHS := $(sort $(dir $(INTERNAL_USERIMAGES_DEPS)))



# $(1): src directory
@@ -578,7 +582,7 @@ INTERNAL_USERIMAGES_BINARY_PATHS := $(sort $(dir $(INTERNAL_USERIMAGES_DEPS))) 
define build-userimage-ext-target

  @mkdir -p $(dir $(2))

  $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$(PATH) \

	  $(MKEXT2USERIMG) $(1) $(2) $(4) $(3) $(5)

	  $(MKEXTUSERIMG) $(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG) $(1) $(2) $(4) $(3) $(5)

endef

else

INTERNAL_USERIMAGES_DEPS := $(MKYAFFS2)
@@ -1045,6 +1049,9 @@ endif 
	$(hide) echo "tool_extensions=$(tool_extensions)" >> $(zip_root)/META/misc_info.txt

ifdef mkyaffs2_extra_flags

	$(hide) echo "mkyaffs2_extra_flags=$(mkyaffs2_extra_flags)" >> $(zip_root)/META/misc_info.txt

endif

ifdef INTERNAL_USERIMAGES_SPARSE_EXT_FLAG

	$(hide) echo "extfs_sparse_flag=$(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG)" >> $(zip_root)/META/misc_info.txt

endif

	@# Zip everything up, preserving symlinks

	$(hide) (cd $(zip_root) && zip -qry ../$(notdir $@) .)

core/config.mk

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ APICHECK := $(HOST_OUT_EXECUTABLES)/apicheck$(HOST_EXECUTABLE_SUFFIX) 
FS_GET_STATS := $(HOST_OUT_EXECUTABLES)/fs_get_stats$(HOST_EXECUTABLE_SUFFIX)

MKEXT2IMG := $(HOST_OUT_EXECUTABLES)/genext2fs$(HOST_EXECUTABLE_SUFFIX)

MAKE_EXT4FS := $(HOST_OUT_EXECUTABLES)/make_ext4fs$(HOST_EXECUTABLE_SUFFIX)

MKEXT2USERIMG := $(HOST_OUT_EXECUTABLES)/mkuserimg.sh

MKEXTUSERIMG := $(HOST_OUT_EXECUTABLES)/mkuserimg.sh

MKEXT2BOOTIMG := external/genext2fs/mkbootimg_ext2.sh

MKTARBALL := build/tools/mktarball.sh

TUNE2FS := tune2fs

tools/releasetools/img_from_target_files

+15 −8
Original line number Diff line number Diff line
@@ -61,10 +61,13 @@ def AddUserdata(output_zip): 
  img = tempfile.NamedTemporaryFile()



  build_command = []

  if OPTIONS.info_dict["fstab"]["/data"].fs_type.startswith("ext"):

    build_command = ["mkuserimg.sh",

                     user_dir, img.name,

                     OPTIONS.info_dict["fstab"]["/data"].fs_type, "data"]

  fstab = OPTIONS.info_dict["fstab"]

  if fstab and fstab["/data"].fs_type.startswith("ext"):

    build_command = ["mkuserimg.sh"]

    if "extfs_sparse_flag" in OPTIONS.info_dict:

      build_command.append(OPTIONS.info_dict["extfs_sparse_flag"])

    build_command.extend([user_dir, img.name,

                     fstab["/data"].fs_type, "data"])

    if "userdata_size" in OPTIONS.info_dict:

      build_command.append(str(OPTIONS.info_dict["userdata_size"]))

  else:
@@ -109,10 +112,14 @@ def AddSystem(output_zip): 
      pass



  build_command = []

  if OPTIONS.info_dict["fstab"]["/system"].fs_type.startswith("ext"):

    build_command = ["mkuserimg.sh",

                     os.path.join(OPTIONS.input_tmp, "system"), img.name,

                     OPTIONS.info_dict["fstab"]["/system"].fs_type, "system"]

  fstab = OPTIONS.info_dict["fstab"]

  if fstab and fstab["/system"].fs_type.startswith("ext"):



    build_command = ["mkuserimg.sh"]

    if "extfs_sparse_flag" in OPTIONS.info_dict:

      build_command.append(OPTIONS.info_dict["extfs_sparse_flag"])

    build_command.extend([os.path.join(OPTIONS.input_tmp, "system"), img.name,

                     fstab["/system"].fs_type, "system"])

    if "system_size" in OPTIONS.info_dict:

      build_command.append(str(OPTIONS.info_dict["system_size"]))

  else: