diff options
| author | Alessio Balsini <balsini@google.com> | 2022-05-18 18:09:16 +0100 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2022-09-13 10:41:22 -0400 |
| commit | dbaedc87e9d048077385c3a07a5ffbde518e5d28 (patch) | |
| tree | 4808a54556d20f72e34b43f70879c63a86bc0a61 /contrib | |
| parent | 80c777a3458879029232adbb16b2fcd503316ce1 (diff) | |
| download | e2fsprogs-dbaedc87e9d048077385c3a07a5ffbde518e5d28.tar.gz | |
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
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/android/Android.bp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/android/Android.bp b/contrib/android/Android.bp index c33ebf49..189211b6 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", ], |