Merge "Work around e2fsck issue for building sparse GSIs"

am: a0d3277b8d

Change-Id: I53b45da39145cb10f37bd7bcede55f13cfed801b
This commit is contained in:
Isaac Chen
2018-08-03 17:07:18 -07:00
committed by android-build-merger

View File

@@ -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)