commit b83c09812f30d36285cacdf5cf824c56c267f8e5
author Kenny Root <kroot@google.com> Wed Oct 10 11:26:33 2012 -0700
committer Kenny Root <kroot@google.com> Tue Oct 16 12:34:06 2012 -0700
tree 2a32747cd62f4cb1e542bf1b30018b7001ebc530
parent 51ccef27cab58277775e62518a59666d2a059b62

Remove HAVE_SELINUX guards

Change-Id: Idef0a784a1d237257ff4135bb1df62ff8a67ded3

toolbox/Android.mk

diff --git a/toolbox/Android.mk b/toolbox/Android.mk
index be95e7c..2c1ba42 100644
--- a/toolbox/Android.mk
+++ b/toolbox/Android.mk
@@ -56,11 +56,7 @@
 	ionice \
 	touch \
 	lsof \
-	md5
-
-ifeq ($(HAVE_SELINUX),true)
-
-TOOLS += \
+	md5 \
 	getenforce \
 	setenforce \
 	chcon \
@@ -70,9 +66,6 @@
 	setsebool \
 	load_policy
 
-endif
-
-
 ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
 TOOLS += r
 endif
@@ -82,17 +75,13 @@
 	toolbox.c \
 	$(patsubst %,%.c,$(TOOLS))
 
-LOCAL_SHARED_LIBRARIES := libcutils libc libusbhost
-
 LOCAL_C_INCLUDES := bionic/libc/bionic
 
-ifeq ($(HAVE_SELINUX),true)
-
-LOCAL_CFLAGS += -DHAVE_SELINUX
-LOCAL_SHARED_LIBRARIES += libselinux
-LOCAL_C_INCLUDES += external/libselinux/include
-
-endif
+LOCAL_SHARED_LIBRARIES := \
+	libcutils \
+	libc \
+	libusbhost \
+	libselinux
 
 LOCAL_MODULE:= toolbox