commit a0d3277b8d4455c8988436595e6a33adc4230aae
author Treehugger Robot <treehugger-gerrit@google.com> Fri Aug 03 23:29:33 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 03 23:29:33 2018 +0000
tree 84700da2c33be6a45526c0d696d4ec14c4880052
parent d80175db9a5cd72e4515d3eea7ee63223fe9d11c
parent ec7fa1cd0904419a2831b8da757ae670a875baed

Merge "Work around e2fsck issue for building sparse GSIs"

tools/releasetools/build_image.py

diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py
index 83bf7fd..5b46ab0 100755
--- a/tools/releasetools/build_image.py
+++ b/tools/releasetools/build_image.py
@@ -745,7 +745,9 @@
 
     # 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)