Merge "Work around e2fsck issue for building sparse GSIs"

2018-08-03 23:29:33 +00:00
parent d80175db9a ec7fa1cd09
commit a0d3277b8d
1 changed files with 3 additions and 1 deletions
--- a/tools/releasetools/build_image.py
+++ b/tools/releasetools/build_image.py
@@ -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)