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

Commit 29a01789 authored by Mohamad Ayyash's avatar Mohamad Ayyash Committed by Android Git Automerger
Browse files

am 9b19382f: resolved conflicts for merge of fc759204 to stage-aosp-master 

* commit '9b19382f':
  Allow flashing a squashfs system image
parents d1e748c0 9b19382f

core/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -681,6 +681,10 @@ INTERNAL_USERIMAGES_DEPS += $(MKF2FSUSERIMG) $(MAKE_F2FS) 
endif

endif



ifeq ($(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),squashfs)

INTERNAL_USERIMAGES_DEPS += $(MAKE_SQUASHFS) $(MKSQUASHFSUSERIMG)

endif



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



ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY))
@@ -695,6 +699,7 @@ INTERNAL_USERIMAGES_DEPS += $(SELINUX_FC) 
define generate-userimage-prop-dictionary

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

$(if $(BOARD_SYSTEMIMAGE_PARTITION_SIZE),$(hide) echo "system_size=$(BOARD_SYSTEMIMAGE_PARTITION_SIZE)" >> $(1))

$(if $(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "system_fs_type=$(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE)" >> $(1))

$(if $(BOARD_SYSTEMIMAGE_JOURNAL_SIZE),$(hide) echo "system_journal_size=$(BOARD_SYSTEMIMAGE_JOURNAL_SIZE)" >> $(1))

$(if $(BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "userdata_fs_type=$(BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE)" >> $(1))

$(if $(BOARD_USERDATAIMAGE_PARTITION_SIZE),$(hide) echo "userdata_size=$(BOARD_USERDATAIMAGE_PARTITION_SIZE)" >> $(1))
@@ -898,6 +903,7 @@ INTERNAL_SYSTEMIMAGE_FILES := $(filter $(TARGET_OUT)/%, \ 
    $(PDK_FUSION_SYSIMG_FILES) \

    $(RECOVERY_RESOURCE_ZIP))





FULL_SYSTEMIMAGE_DEPS := $(INTERNAL_SYSTEMIMAGE_FILES) $(INTERNAL_USERIMAGES_DEPS)

# -----------------------------------------------------------------

# installed file list

core/config.mk

+7 −0
Original line number Diff line number Diff line
@@ -398,6 +398,13 @@ APICHECK := $(HOST_OUT_EXECUTABLES)/apicheck$(HOST_EXECUTABLE_SUFFIX) 
FS_GET_STATS := $(HOST_OUT_EXECUTABLES)/fs_get_stats$(HOST_EXECUTABLE_SUFFIX)

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

MKEXTUSERIMG := $(HOST_OUT_EXECUTABLES)/mkuserimg.sh

ifeq ($(HOST_OS),linux)

MAKE_SQUASHFS := $(HOST_OUT_EXECUTABLES)/mksquashfs$(HOST_EXECUTABLE_SUFFIX)

MKSQUASHFSUSERIMG := $(HOST_OUT_EXECUTABLES)/mksquashfsimage.sh

else

MAKE_SQUASHFS :=

MKSQUASHFSUSERIMG :=

endif

MAKE_F2FS := $(HOST_OUT_EXECUTABLES)/make_f2fs$(HOST_EXECUTABLE_SUFFIX)

MKF2FSUSERIMG := $(HOST_OUT_EXECUTABLES)/mkf2fsuserimg.sh

SIMG2IMG := $(HOST_OUT_EXECUTABLES)/simg2img$(HOST_EXECUTABLE_SUFFIX)

core/product.mk

+1 −0
Original line number Diff line number Diff line
@@ -252,6 +252,7 @@ _product_stash_var_list += \ 
	BOARD_BOOTIMAGE_PARTITION_SIZE \

	BOARD_RECOVERYIMAGE_PARTITION_SIZE \

	BOARD_SYSTEMIMAGE_PARTITION_SIZE \

	BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE \

	BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE \

	BOARD_USERDATAIMAGE_PARTITION_SIZE \

	BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE \

tools/releasetools/build_image.py

+10 −0
Original line number Diff line number Diff line
@@ -253,6 +253,14 @@ def BuildImage(in_dir, prop_dict, out_file, 
      build_command.append(fc_config)

    elif "selinux_fc" in prop_dict:

      build_command.append(prop_dict["selinux_fc"])

  elif fs_type.startswith("squash"):

    build_command = ["mksquashfsimage.sh"]

    build_command.extend([in_dir, out_file])

    build_command.extend(["-m", prop_dict["mount_point"]])

    if fc_config is not None:

      build_command.extend(["-c", fc_config])

    elif "selinux_fc" in prop_dict:

      build_command.extend(["-c", prop_dict["selinux_fc"]])

  elif fs_type.startswith("f2fs"):

    build_command = ["mkf2fsuserimg.sh"]

    build_command.extend([out_file, prop_dict["partition_size"]])
@@ -321,6 +329,8 @@ def ImagePropFromGlobalDict(glob_dict, mount_point): 
  d["mount_point"] = mount_point

  if mount_point == "system":

    copy_prop("fs_type", "fs_type")

    # Copy the generic sysetem fs type first, override with specific one if available.

    copy_prop("system_fs_type", "fs_type")

    copy_prop("system_size", "partition_size")

    copy_prop("system_journal_size", "journal_size")

    copy_prop("system_verity_block_device", "verity_block_device")