commit cf15ab2a2e73595aefeb56a0b7955694c2070a65
author Dan Willemsen <dwillemsen@google.com> Wed Sep 27 00:12:05 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 27 00:12:05 2017 +0000
tree c6e70cde898c268b0067fdabafbc9760c727707d
parent 8c214c801b59ca22b66a0f5cbb3c61af39311fc3
parent de36999a73617500d83379e36c23ae4cc2b12a7e

Always use our copy of libz am: 096dd9a722
am: de36999a73

Change-Id: I0aa1740180be74d9a4b3c2d6de103c7c00de0654

squashfs-tools/Android.mk

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 @@
                 -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)