From 2244cd322f7aab549045e8bbfe25226831daeeb7 Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Wed, 10 Oct 2012 11:01:02 -0700
Subject: [PATCH 1/2] Remove HAVE_SELINUX guard

Change-Id: Ie34c958fb20757f733b6c933bfe52691f773a342
---
 target/product/core.mk | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/target/product/core.mk b/target/product/core.mk
index 87872d6b2b..136f76411b 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -127,6 +127,14 @@ PRODUCT_PACKAGES += \
     zoneinfo.idx \
     zoneinfo.version
 
+# SELinux packages
+PRODUCT_PACKAGES += \
+    sepolicy \
+    file_contexts \
+    seapp_contexts \
+    property_contexts \
+    mac_permissions.xml
+
 PRODUCT_COPY_FILES += \
     system/core/rootdir/init.usb.rc:root/init.usb.rc \
     system/core/rootdir/init.trace.rc:root/init.trace.rc \
@@ -150,14 +158,4 @@ ifeq ($(WITH_HOST_DALVIK),true)
         zoneinfo-host.version
 endif
 
-ifeq ($(HAVE_SELINUX),true)
-    PRODUCT_PACKAGES += \
-        sepolicy \
-        file_contexts \
-        seapp_contexts \
-        property_contexts \
-        mac_permissions.xml
-endif
-
 $(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)
-

From 92ca0197ed22897633ed9241c9f4ae2128ef5c13 Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Tue, 16 Oct 2012 13:43:08 -0700
Subject: [PATCH 2/2] Remove HAVE_SELINUX guards, part 2

Change-Id: I58d43128447ef3be0f70ff2479af2e61fe4c5849
---
 core/Makefile | 2 +-
 core/main.mk  | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/core/Makefile b/core/Makefile
index 013efb8192..4e547ad978 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -571,7 +571,7 @@ $(if $(BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "cache_fs_type=$(BOARD_CA
 $(if $(BOARD_CACHEIMAGE_PARTITION_SIZE),$(hide) echo "cache_size=$(BOARD_CACHEIMAGE_PARTITION_SIZE)" >> $(1))
 $(if $(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG),$(hide) echo "extfs_sparse_flag=$(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG)" >> $(1))
 $(if $(mkyaffs2_extra_flags),$(hide) echo "mkyaffs2_extra_flags=$(mkyaffs2_extra_flags)" >> $(1))
-$(if $(filter true, $(strip $(HAVE_SELINUX))), echo "selinux_fc=$(TARGET_ROOT_OUT)/file_contexts" >> $(1))
+$(hide) echo "selinux_fc=$(TARGET_ROOT_OUT)/file_contexts" >> $(1)
 endef
 
 # -----------------------------------------------------------------
diff --git a/core/main.mk b/core/main.mk
index 77f9fc5106..b9c40dfdab 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -270,11 +270,6 @@ ifneq ($(filter sdk win_sdk sdk_addon,$(MAKECMDGOALS)),)
 is_sdk_build := true
 endif
 
-## have selinux ##
-ifeq ($(HAVE_SELINUX),true)
-ADDITIONAL_BUILD_PROPERTIES += ro.build.selinux=1
-endif # HAVE_SELINUX
-
 ## user/userdebug ##
 
 user_variant := $(filter user userdebug,$(TARGET_BUILD_VARIANT))