| commit | 0bb150b636a7055cf759e7fcd0d8314d71487170 | [log] [tgz] |
|---|---|---|
| author | Dmitriy Ivanov <dimitry@google.com> | Fri Mar 13 21:19:11 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Mar 13 21:19:12 2015 +0000 |
| tree | b719a5d10234250e61ef3954c3ec3f7cb2fe25f2 | |
| parent | 810c47dc9589fe3d550987584c7f3366ecd90d8e [diff] | |
| parent | b2ae9d79b16980f3cad02310b95d0533ff24d877 [diff] |
Merge "Switch libz to sysv-only hash style"
diff --git a/Android.mk b/Android.mk index c8cf0b1..b0e4b63 100644 --- a/Android.mk +++ b/Android.mk
@@ -27,7 +27,7 @@ LOCAL_CFLAGS += -O3 -DUSE_MMAP # TODO: This is to work around b/19059885. Remove after root cause is fixed -LOCAL_LDFLAGS_arm := -Wl,--hash-style=both +LOCAL_LDFLAGS_arm := -Wl,--hash-style=sysv LOCAL_SRC_FILES := $(zlib_files) ifneq ($(TARGET_BUILD_APPS),)