aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Wilson <simonwilson@google.com>2015-06-22 16:39:30 -0700
committerSimon Wilson <simonwilson@google.com>2015-06-22 16:39:30 -0700
commit4f71fdf56ecf96e96be7e12dacb2cf84357963f6 (patch)
treee47ab8bcab1d7ea60b6657701fb692ce6237332f
parenta1dd2fc317a47496c175e49407fae4804995e96b (diff)
downloadsquashfs-tools-4f71fdf56ecf96e96be7e12dacb2cf84357963f6.tar.gz
DO NOT MERGE Revert "squasfs-tool: use libcutils and libselinux shared libraries"
This reverts commit a1dd2fc317a47496c175e49407fae4804995e96b. This change is incompatible with Lollipop and causes build failure.
-rw-r--r--squashfs-tools/Android.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/squashfs-tools/Android.mk b/squashfs-tools/Android.mk
index ec672be..9f93aba 100644
--- a/squashfs-tools/Android.mk
+++ b/squashfs-tools/Android.mk
@@ -66,8 +66,7 @@ LOCAL_LDLIBS := -lpthread -lm -lz
LOCAL_C_INCLUDES := external/lz4/lib
-LOCAL_SHARED_LIBRARIES := libcutils libselinux
-LOCAL_STATIC_LIBRARIES := liblz4
+LOCAL_STATIC_LIBRARIES := libcutils liblog liblz4 libselinux
LOCAL_MODULE_TAGS := optional