openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

am 2e0d1af7: Merge changes I58d43128,Ie34c958f 

* commit '2e0d1af767f64996f47de2a84b685ddcfa02e686':
  Remove HAVE_SELINUX guards, part 2
  Remove HAVE_SELINUX guard
This commit is contained in:
Kenny Root 2012-10-16 17:34:42 -07:00 committed by Android Git Automerger
parent 165c67aacd 2e0d1af767
commit 37868329b2
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/Makefile
View File

@ -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 $(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 $(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 $(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 endef
# ----------------------------------------------------------------- # -----------------------------------------------------------------

5
core/main.mk
View File

@ -275,11 +275,6 @@ ifneq ($(filter sdk win_sdk sdk_addon,$(MAKECMDGOALS)),)
is_sdk_build := true is_sdk_build := true
endif endif
## have selinux ##
ifeq ($(HAVE_SELINUX),true)
ADDITIONAL_BUILD_PROPERTIES += ro.build.selinux=1
endif # HAVE_SELINUX
## user/userdebug ## ## user/userdebug ##
user_variant := $(filter user userdebug,$(TARGET_BUILD_VARIANT)) user_variant := $(filter user userdebug,$(TARGET_BUILD_VARIANT))

18
target/product/core.mk
View File

@ -134,6 +134,14 @@ PRODUCT_PACKAGES += \
zoneinfo.idx \ zoneinfo.idx \
zoneinfo.version zoneinfo.version
# SELinux packages
PRODUCT_PACKAGES += \
sepolicy \
file_contexts \
seapp_contexts \
property_contexts \
mac_permissions.xml
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
system/core/rootdir/init.usb.rc:root/init.usb.rc \ system/core/rootdir/init.usb.rc:root/init.usb.rc \
system/core/rootdir/init.trace.rc:root/init.trace.rc \ system/core/rootdir/init.trace.rc:root/init.trace.rc \
@ -157,14 +165,4 @@ ifeq ($(WITH_HOST_DALVIK),true)
zoneinfo-host.version zoneinfo-host.version
endif 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) $(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)