diff options
| author | Kenny Root <kroot@google.com> | 2012-10-16 17:34:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-16 17:34:42 -0700 |
| commit | 37868329b29ae7c2399860aee1fcf30f6ebd3fa6 (patch) | |
| tree | e82130cb724be0439e0532b2d3adcf9a5b94a74a | |
| parent | 165c67aacd8c6e8e6ffe57e673602952e4b56219 (diff) | |
| parent | 2e0d1af767f64996f47de2a84b685ddcfa02e686 (diff) | |
| download | build-37868329b29ae7c2399860aee1fcf30f6ebd3fa6.zip build-37868329b29ae7c2399860aee1fcf30f6ebd3fa6.tar.gz build-37868329b29ae7c2399860aee1fcf30f6ebd3fa6.tar.bz2 | |
am 2e0d1af7: Merge changes I58d43128,Ie34c958f
* commit '2e0d1af767f64996f47de2a84b685ddcfa02e686':
Remove HAVE_SELINUX guards, part 2
Remove HAVE_SELINUX guard
| -rw-r--r-- | core/Makefile | 2 | ||||
| -rw-r--r-- | core/main.mk | 5 | ||||
| -rw-r--r-- | target/product/core.mk | 18 |
3 files changed, 9 insertions, 16 deletions
diff --git a/core/Makefile b/core/Makefile index e0f6da8..d501183 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 ffc1501..27e68c4 100644 --- a/core/main.mk +++ b/core/main.mk @@ -275,11 +275,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)) diff --git a/target/product/core.mk b/target/product/core.mk index 831298a..0a04893 100644 --- a/target/product/core.mk +++ b/target/product/core.mk @@ -134,6 +134,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 \ @@ -157,14 +165,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) - |