summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2019-03-20 21:13:33 -0700
committerColin Cross <ccross@android.com>2019-03-20 21:19:57 -0700
commitd7632929ea100e92e39ef8375adeb9dfbb7f94fe (patch)
treec3a68545f37bd7e9b4ad8ac6e8571fd27ff45905
parentf6cbc2d533ad1099618e5d4dc3276241beb401d2 (diff)
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
-rw-r--r--startop/view_compiler/Android.bp1
1 files changed, 0 insertions, 1 deletions
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: [