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

Commit bb2b82bd authored by Ying Wang's avatar Ying Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix userdata partition's ext4 mount point to data." into gingerbread

parents ef5fd0e1 026f1451

core/Makefile

+2 −2
Original line number Original line Diff line number Diff line
@@ -572,7 +572,7 @@ INTERNAL_USERIMAGES_BINARY_PATHS := $(sort $(dir $(INTERNAL_USERIMAGES_DEPS))) 




# $(1): src directory

# $(1): src directory

# $(2): output file

# $(2): output file

# $(3): label

# $(3): mount point

# $(4): ext variant (ext2, ext3, ext4)

# $(4): ext variant (ext2, ext3, ext4)

# $(5): size of the partition

# $(5): size of the partition

define build-userimage-ext-target

define build-userimage-ext-target
@@ -797,7 +797,7 @@ ifeq ($(INTERNAL_USERIMAGES_USE_EXT),true) 
define build-userdataimage-target

define build-userdataimage-target

    $(call pretty,"Target userdata fs image: $(INSTALLED_USERDATAIMAGE_TARGET)")

    $(call pretty,"Target userdata fs image: $(INSTALLED_USERDATAIMAGE_TARGET)")

    @mkdir -p $(TARGET_OUT_DATA)

    @mkdir -p $(TARGET_OUT_DATA)

    $(call build-userimage-ext-target,$(TARGET_OUT_DATA),$(INSTALLED_USERDATAIMAGE_TARGET),userdata,$(INTERNAL_USERIMAGES_EXT_VARIANT),$(BOARD_USERDATAIMAGE_PARTITION_SIZE))

    $(call build-userimage-ext-target,$(TARGET_OUT_DATA),$(INSTALLED_USERDATAIMAGE_TARGET),data,$(INTERNAL_USERIMAGES_EXT_VARIANT),$(BOARD_USERDATAIMAGE_PARTITION_SIZE))

    $(hide) $(call assert-max-image-size,$(INSTALLED_USERDATAIMAGE_TARGET),$(BOARD_USERDATAIMAGE_PARTITION_SIZE),yaffs)

    $(hide) $(call assert-max-image-size,$(INSTALLED_USERDATAIMAGE_TARGET),$(BOARD_USERDATAIMAGE_PARTITION_SIZE),yaffs)

endef

endef

tools/releasetools/img_from_target_files

+1 −1
Original line number Original line Diff line number Diff line
@@ -64,7 +64,7 @@ def AddUserdata(output_zip): 
  if OPTIONS.info_dict["fstab"]["/data"].fs_type.startswith("ext"):

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

    build_command = ["mkuserimg.sh",

    build_command = ["mkuserimg.sh",

                     user_dir, img.name,

                     user_dir, img.name,

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

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

    if "userdata_size" in OPTIONS.info_dict:

    if "userdata_size" in OPTIONS.info_dict:

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

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

  else:

  else: