From d7632929ea100e92e39ef8375adeb9dfbb7f94fe Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 20 Mar 2019 21:13:33 -0700 Subject: Fix ODR issue in viewcompiler libz is already linked as a static library through libdexfile_static_defaults, don't also link it as a shared library. Fixes: ================================================================= ==43189==ERROR: AddressSanitizer: odr-violation (0x55d1ed723a60): [1] size=48 'inflate_copyright' external/zlib/src/inftrees.c:11:12 [2] size=48 'inflate_copyright' external/zlib/src/inftrees.c:11:12 These globals were registered at these points: [1]: #0 0x55d1ed769a0e (/buildbot/src/android/master/out/soong/host/linux-x86/bin/viewcompiler+0xf3a0e) #1 0x55d1ed991b1b (/buildbot/src/android/master/out/soong/host/linux-x86/bin/viewcompiler+0x31bb1b) [2]: #0 0x55d1ed769a0e (/buildbot/src/android/master/out/soong/host/linux-x86/bin/viewcompiler+0xf3a0e) #1 0x7f5dff20a09b (/buildbot/src/android/master/out/soong/host/linux-x86/bin/../lib64/libz-host.so+0x3e09b) Test: m SANITIZE_HOST=address viewcompiler && viewcompiler Change-Id: I4ebdf7ef4ec1641488fbc25275dbf6aa0cdbe2eb --- startop/view_compiler/Android.bp | 1 - 1 file changed, 1 deletion(-) diff --git a/startop/view_compiler/Android.bp b/startop/view_compiler/Android.bp index f5b4308a1b50..92ea872f04fc 100644 --- a/startop/view_compiler/Android.bp +++ b/startop/view_compiler/Android.bp @@ -22,7 +22,6 @@ cc_defaults { ], shared_libs: [ "libbase", - "libz", "slicer", ], static_libs: [ -- cgit v1.2.3-59-g8ed1b