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

Commit 13f3b533 authored by Adrien Schildknecht's avatar Adrien Schildknecht Committed by android-build-merger
Browse files

Manually merge commit 'c13da910' into stage-aosp-master 

am: ada51f3b

Change-Id: Idc324a9e89bd4bf7e099395a72b5868d7040d545
parents 59f8c3f5 ada51f3b

core/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -835,6 +835,7 @@ INTERNAL_USERIMAGES_DEPS += $(BLK_ALLOC_TO_BASE_FS) 
# $(1): the path of the output dictionary file

# $(2): additional "key=value" pairs to append to the dictionary file.

define generate-userimage-prop-dictionary

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

$(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))
@@ -1718,8 +1719,8 @@ OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \ 
  $(HOST_OUT_JAVA_LIBRARIES)/dumpkey.jar \

  $(HOST_OUT_JAVA_LIBRARIES)/signapk.jar \

  $(HOST_OUT_JAVA_LIBRARIES)/BootSignature.jar \

  $(HOST_OUT_EXECUTABLES)/mkuserimg.sh \

  $(HOST_OUT_EXECUTABLES)/make_ext4fs \

  $(MAKE_EXT4FS) \

  $(MKEXTUSERIMG) \

  $(HOST_OUT_EXECUTABLES)/mksquashfsimage.sh \

  $(HOST_OUT_EXECUTABLES)/mksquashfs \

  $(HOST_OUT_EXECUTABLES)/mkf2fsuserimg.sh \

core/config.mk

+6 −1
Original line number Diff line number Diff line
@@ -584,9 +584,14 @@ AVBTOOL := $(BOARD_CUSTOM_AVBTOOL) 
endif

APICHECK := $(HOST_OUT_EXECUTABLES)/apicheck$(HOST_EXECUTABLE_SUFFIX)

FS_GET_STATS := $(HOST_OUT_EXECUTABLES)/fs_get_stats$(HOST_EXECUTABLE_SUFFIX)

ifeq ($(TARGET_USES_MKE2FS),true)

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

MKEXTUSERIMG := $(HOST_OUT_EXECUTABLES)/mkuserimg_mke2fs.sh

else

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

BLK_ALLOC_TO_BASE_FS := $(HOST_OUT_EXECUTABLES)/blk_alloc_to_base_fs$(HOST_EXECUTABLE_SUFFIX)

MKEXTUSERIMG := $(HOST_OUT_EXECUTABLES)/mkuserimg.sh

endif

BLK_ALLOC_TO_BASE_FS := $(HOST_OUT_EXECUTABLES)/blk_alloc_to_base_fs$(HOST_EXECUTABLE_SUFFIX)

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

MKSQUASHFSUSERIMG := $(HOST_OUT_EXECUTABLES)/mksquashfsimage.sh

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

tools/releasetools/build_image.py

+2 −1
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ def BuildImage(in_dir, prop_dict, out_file, target_out=None): 
    prop_dict["original_partition_size"] = str(partition_size)



  if fs_type.startswith("ext"):

    build_command = ["mkuserimg.sh"]

    build_command = [prop_dict["ext_mkuserimg"]]

    if "extfs_sparse_flag" in prop_dict:

      build_command.append(prop_dict["extfs_sparse_flag"])

      run_fsck = True
@@ -608,6 +608,7 @@ def ImagePropFromGlobalDict(glob_dict, mount_point): 
      "squashfs_sparse_flag",

      "selinux_fc",

      "skip_fsck",

      "ext_mkuserimg",

      "verity",

      "verity_key",

      "verity_signer_cmd",