commit 27809667b4937a20732ea619cba7e41ca9e8d212
author Tao Bao <tbao@google.com> Mon Oct 29 15:54:05 2018 -0700
committer Tao Bao <tbao@google.com> Mon Oct 29 16:02:47 2018 -0700
tree a3ad5c09aca0b154d32c52342efda6e08e625f6c
parent 89fe71180b829916b09d76a8f76e217b34ab3ce1

Revert "Work around e2fsck issue for building sparse GSIs"

This reverts commit ec7fa1cd0904419a2831b8da757ae670a875baed.

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

tools/releasetools/build_image.py

diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py
index b88171f..c256571 100755
--- a/tools/releasetools/build_image.py
+++ b/tools/releasetools/build_image.py
@@ -474,11 +474,8 @@
 
     # 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)