From: Mark Salyzyn <salyzyn@google.com>
Date: Thu, 25 Oct 2018 20:00:51 +0000 (-0700)
Subject: AOSP: ODR violation in tune2fs during host build
X-Git-Tag: v1.44.5~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48f138da1d553d6961c34d72d61043d99087bad5;p=thirdparty%2Fe2fsprogs.git

AOSP: ODR violation in tune2fs during host build

Port of commit 3271c69c97f486914fea833a36eaf5d86938c76d as applied to
e2fsck, but to tune2fs.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

Bug: 112062612
Bug: 111302946
Test: $ m SANITIZE_HOST=address out/host/linux-x86/bin/tune2fs
      $ out/host/linux-x86/bin/tune2fs --help
Change-Id: If49d367d96b7bfd0b8b79c6bde23c0ded52ca683
From AOSP commit: 1cb5de330e5d1e0c6f587945ec065b995cc1c84b
---

diff --git a/misc/Android.bp b/misc/Android.bp
index 310c9dc70..ccc4fdb46 100644
--- a/misc/Android.bp
+++ b/misc/Android.bp
@@ -117,7 +117,6 @@ cc_defaults {
 }
 
 tune2fs_libs = [
-    "libext2_com_err",
     "libext2_blkid",
     "libext2_quota",
     "libext2_uuid",