resolved conflicts for merge of 37868329 to master
Change-Id: I437f42a7197d1716b4783749f2b27e19c8721395
diff --git a/core/Makefile b/core/Makefile
index 869379c..900c3c9 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -571,7 +571,7 @@
$(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 d86783b..020852a 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -275,11 +275,6 @@
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))
diff --git a/target/product/core.mk b/target/product/core.mk
index f76dc24..993420f 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -135,6 +135,14 @@
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 \
@@ -158,14 +166,4 @@
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)