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

Commit 63f58390 authored by bowgotsai's avatar bowgotsai
Browse files

Move AVB related properties from 'system_other' to 'system' 

The original CL in AOSP is for 'system' partition.
Howerver, after automerger merges the CL from aosp to goog gerrit, it
patches part of the properties to 'system_other' partition. Correct this by
moving the system_avb* properties to 'system'.

Bug: 31264226
Test: build aosp_angler-userdebug successfully
Change-Id: I1a7128d29c1152315e9b50cfe5bbe13b47b131a7
parent 6b7752ec

tools/releasetools/build_image.py

+3 −3
Original line number Diff line number Diff line
@@ -633,6 +633,9 @@ def ImagePropFromGlobalDict(glob_dict, mount_point): 
    copy_prop("system_squashfs_block_size", "squashfs_block_size")

    copy_prop("system_squashfs_disable_4k_align", "squashfs_disable_4k_align")

    copy_prop("system_base_fs_file", "base_fs_file")

    copy_prop("system_avb_enable", "avb_enable")

    copy_prop("system_avb_add_hashtree_footer_args",

              "avb_add_hashtree_footer_args")

  elif mount_point == "system_other":

    # We inherit the selinux policies of /system since we contain some of its files.

    d["mount_point"] = "system"
@@ -646,9 +649,6 @@ def ImagePropFromGlobalDict(glob_dict, mount_point): 
    copy_prop("system_squashfs_compressor_opt", "squashfs_compressor_opt")

    copy_prop("system_squashfs_block_size", "squashfs_block_size")

    copy_prop("system_base_fs_file", "base_fs_file")

    copy_prop("system_avb_enable", "avb_enable")

    copy_prop("system_avb_add_hashtree_footer_args",

              "avb_add_hashtree_footer_args")

  elif mount_point == "data":

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

    copy_prop("fs_type", "fs_type")