commit efa2a473ce8915ca9332c621479b79d26cdc1cf7
author Simon Wilson <simonwilson@google.com> Wed Jun 24 23:16:31 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 24 23:16:31 2015 +0000
tree ee6115570b794c9c8eb274681c35eec3a5e816f2
parent 10274203a57f8d4d0b69f013f032f633bb785dc2
parent 4f71fdf56ecf96e96be7e12dacb2cf84357963f6

am 4f71fdf5: (-s ours) DO NOT MERGE Revert "squasfs-tool: use libcutils and libselinux shared libraries"

* commit '4f71fdf56ecf96e96be7e12dacb2cf84357963f6':
  DO NOT MERGE Revert "squasfs-tool: use libcutils and libselinux shared libraries"

squashfs-tools/Android.mk

diff --git a/squashfs-tools/Android.mk b/squashfs-tools/Android.mk
index 9f93aba..ec672be 100644
--- a/squashfs-tools/Android.mk
+++ b/squashfs-tools/Android.mk
@@ -66,7 +66,8 @@
 
 LOCAL_C_INCLUDES := external/lz4/lib
 
-LOCAL_STATIC_LIBRARIES := libcutils liblog liblz4 libselinux
+LOCAL_SHARED_LIBRARIES := libcutils libselinux
+LOCAL_STATIC_LIBRARIES := liblz4
 
 LOCAL_MODULE_TAGS := optional
 

squashfs-tools/pseudo.c

diff --git a/squashfs-tools/pseudo.c b/squashfs-tools/pseudo.c
index f85fe60..da798f7 100644
--- a/squashfs-tools/pseudo.c
+++ b/squashfs-tools/pseudo.c
@@ -518,7 +518,8 @@
 
 void dump_pseudos()
 {
-	dump_pseudo(pseudo, NULL);
+    if (pseudo)
+        dump_pseudo(pseudo, NULL);
 }
 #else
 void dump_pseudos()