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

Commit 27809667 authored by Tao Bao's avatar Tao Bao
Browse files

Revert "Work around e2fsck issue for building sparse GSIs" 

This reverts commit ec7fa1cd.

The earlier e2fsck issue has been addressed by [1].

[1] https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/725259/

Bug: 112062612
Test: m PRODUCT-aosp_x86_64-eng \
          SANITIZE_HOST=address ASAN_OPTIONS=detect_leaks=0 \
          -j e2fsck systemimage
Change-Id: I7287cb8639ae45abdf753821421bd070b819a30e
parent 89fe7118

tools/releasetools/build_image.py

+1 −4
Original line number Diff line number Diff line
@@ -474,11 +474,8 @@ def BuildImage(in_dir, prop_dict, out_file, target_out=None): 


    # Run e2fsck on the inflated image file

    e2fsck_command = ["e2fsck", "-f", "-n", unsparse_image]

    # TODO(b/112062612): work around e2fsck failure with SANITIZE_HOST=address

    env4e2fsck = os.environ.copy()

    env4e2fsck["ASAN_OPTIONS"] = "detect_odr_violation=0"

    try:

      common.RunAndCheckOutput(e2fsck_command, env=env4e2fsck)

      common.RunAndCheckOutput(e2fsck_command)

    finally:

      os.remove(unsparse_image)