Fix SELinux building

A bad merge and some new features caused SELinux not to build on
top-of-tree master. Some changes the Makefile restore its ability to
build.

Change-Id: Id60b89538beff33f1d8b436b5b7854d3eaa00069

diff --git a/ext4_utils/Android.mk b/ext4_utils/Android.mk
index d12a6be..5dae31f 100644 (file)
--- a/ext4_utils/Android.mk
+++ b/ext4_utils/Android.mk
@@ -27,7 +27,7 @@ LOCAL_C_INCLUDES += external/zlib
 
 ifeq ($(HAVE_SELINUX), true)
 LOCAL_C_INCLUDES += external/libselinux/include
-LOCAL_SHARED_LIBRARIES += libselinux
+LOCAL_STATIC_LIBRARIES += libselinux
 LOCAL_CFLAGS += -DHAVE_SELINUX
 endif # HAVE_SELINUX
 
@@ -40,6 +40,10 @@ LOCAL_MODULE := make_ext4fs
 LOCAL_STATIC_LIBRARIES += libext4_utils libz
 ifeq ($(HOST_OS),windows)
 LOCAL_LDLIBS += -lws2_32
+else
+ifeq ($(HAVE_SELINUX), true)
+LOCAL_STATIC_LIBRARIES += libselinux
+endif # HAVE_SELINUX
 endif
 
 include $(BUILD_HOST_EXECUTABLE)