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

Commit dac25a96 authored by Daniel Rosenberg's avatar Daniel Rosenberg Committed by Gerrit Code Review
Browse files

Merge "Add build properties to enable casefold and prj_quota"

parents c99128cd 6cc2c81f

core/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -1550,6 +1550,8 @@ $(if $(filter $(2),system),\ 
$(if $(filter $(2),userdata),\

    $(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))

    $(if $(PRODUCT_FS_CASEFOLD),$(hide) echo "needs_casefold=$(PRODUCT_FS_CASEFOLD)" >> $(1))

    $(if $(PRODUCT_QUOTA_PROJID),$(hide) echo "needs_projid=$(PRODUCT_QUOTA_PROJID)" >> $(1))

    $(hide) echo "userdata_selinux_fc=$(SELINUX_FC)" >> $(1)

)

$(if $(filter $(2),cache),\

target/product/emulated_storage.mk

0 → 100644
+21 −0
Original line number Diff line number Diff line 
#

# Copyright (C) 2020 The Android Open-Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#



PRODUCT_QUOTA_PROJID := 1

PRODUCT_PRODUCT_PROPERTIES += ro.emulated_storage.projid=1



PRODUCT_FS_CASEFOLD := 1

PRODUCT_PRODUCT_PROPERTIES += ro.emulated_storage.casefold=1

tools/releasetools/build_image.py

+12 −1
Original line number Diff line number Diff line
@@ -248,6 +248,8 @@ def BuildImageMkfs(in_dir, prop_dict, out_file, target_out, fs_config): 
  build_command = []

  fs_type = prop_dict.get("fs_type", "")

  run_e2fsck = False

  needs_projid = prop_dict.get("needs_projid", 0)

  needs_casefold = prop_dict.get("needs_casefold", 0)



  if fs_type.startswith("ext"):

    build_command = [prop_dict["ext_mkuserimg"]]
@@ -287,6 +289,9 @@ def BuildImageMkfs(in_dir, prop_dict, out_file, target_out, fs_config): 
        build_command.extend(["-S", prop_dict["hash_seed"]])

    if "ext4_share_dup_blocks" in prop_dict:

      build_command.append("-c")

    if (needs_projid):

      build_command.extend(["--inode_size", "512"])

    else:

      build_command.extend(["--inode_size", "256"])

    if "selinux_fc" in prop_dict:

      build_command.append(prop_dict["selinux_fc"])
@@ -328,6 +333,10 @@ def BuildImageMkfs(in_dir, prop_dict, out_file, target_out, fs_config): 
    if "timestamp" in prop_dict:

      build_command.extend(["-T", str(prop_dict["timestamp"])])

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

    if (needs_projid):

      build_command.append("--prjquota")

    if (needs_casefold):

      build_command.append("--casefold")

  else:

    raise BuildImageError(

        "Error: unknown filesystem type: {}".format(fs_type))
@@ -598,6 +607,8 @@ def ImagePropFromGlobalDict(glob_dict, mount_point): 
    copy_prop("flash_logical_block_size", "flash_logical_block_size")

    copy_prop("flash_erase_block_size", "flash_erase_block_size")

    copy_prop("userdata_selinux_fc", "selinux_fc")

    copy_prop("needs_casefold", "needs_casefold")

    copy_prop("needs_projid", "needs_projid")

  elif mount_point == "cache":

    copy_prop("cache_fs_type", "fs_type")

    copy_prop("cache_size", "partition_size")