aboutsummaryrefslogtreecommitdiff
path: root/squashfs-tools
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2017-09-26 14:50:56 -0700
committerDan Willemsen <dwillemsen@google.com>2017-09-26 14:50:56 -0700
commit096dd9a722334f14a48b3888390c4d1c6d3ca1a6 (patch)
treec6e70cde898c268b0067fdabafbc9760c727707d /squashfs-tools
parent8c214c801b59ca22b66a0f5cbb3c61af39311fc3 (diff)
downloadsquashfs-tools-096dd9a722334f14a48b3888390c4d1c6d3ca1a6.tar.gz
Always use our copy of libz
Instead of hoping that the host libz is compatible with our build time stubs. Also removes -lpthread, which is now automatically added for host tools. Test: m mksquashfs Change-Id: I564f77ec4b5c3622e39f0505d507283aab142335
Diffstat (limited to 'squashfs-tools')
-rw-r--r--squashfs-tools/Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/squashfs-tools/Android.mk b/squashfs-tools/Android.mk
index 74d042f..10b45b6 100644
--- a/squashfs-tools/Android.mk
+++ b/squashfs-tools/Android.mk
@@ -35,9 +35,9 @@ LOCAL_CFLAGS := -I -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -Wal
-Wno-unused-parameter -Wno-sign-compare -Wno-pointer-arith -Wno-missing-field-initializers \
-Wno-unused-function -Werror
-LOCAL_LDLIBS := -lpthread -lm -lz
+LOCAL_LDLIBS := -lm
LOCAL_SHARED_LIBRARIES := libcutils libselinux
-LOCAL_STATIC_LIBRARIES := liblz4
+LOCAL_STATIC_LIBRARIES := liblz4 libz
include $(BUILD_HOST_EXECUTABLE)