From: Alessio Balsini <balsini@google.com>
Date: Wed, 18 May 2022 17:09:16 +0000 (+0100)
Subject: AOSP: e2fsdroid: static import of libbase
X-Git-Tag: v1.47.0~12^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbaedc87e9d048077385c3a07a5ffbde518e5d28;p=thirdparty%2Fe2fsprogs.git

AOSP: e2fsdroid: static import of libbase

Fix a wrong mixed shared/static library inclusion that has been unveiled
by a recent clang upgrade to clang-r450784e: the linker couldn't find
the requested object reference and caused the tool to crash.
libsnapshot_fuzzer_test was luckily catching this misbehaviour as it was
crashing as well when trying to format a loop device as ext4.

Bug: 230851331
Test: m && atest libsnapshot_fuzzer_test
Signed-off-by: Alessio Balsini <balsini@google.com>
Change-Id: I20b7b1d66920eb8f767e49311f913564f14ee30e
Fix AOSP commit: 83239ca87da0bbdb088be7f0d048472e837899c2
---

diff --git a/contrib/android/Android.bp b/contrib/android/Android.bp
index c33ebf49a..189211b68 100644
--- a/contrib/android/Android.bp
+++ b/contrib/android/Android.bp
@@ -46,12 +46,15 @@ cc_binary {
             },
         },
         android: {
+            static_libs: [
+                "libbase",
+            ],
             shared_libs: [
                 "libext2fs",
                 "libext2_com_err",
                 "libext2_misc",
                 "libcutils",
-                "libbase",
+                "liblog",
                 "libselinux",
                 "libcrypto",
             ],