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

Commit 13d3426f authored by Isaac Chen's avatar Isaac Chen Committed by android-build-merger
Browse files

Merge "Work around e2fsck issue for building sparse GSIs"

am: a0d3277b

Change-Id: I53b45da39145cb10f37bd7bcede55f13cfed801b
parents 0324a550 a0d3277b
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -745,7 +745,9 @@ 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]
    (e2fsck_output, exit_code) = RunCommand(e2fsck_command)
    # TODO(b/112062612): work around e2fsck failure with SANITIZE_HOST=address
    env4e2fsck = {"ASAN_OPTIONS": "detect_odr_violation=0"}
    (e2fsck_output, exit_code) = RunCommand(e2fsck_command, env=env4e2fsck)

    os.remove(unsparse_image)