StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 392bdc1f: Merge "Move the selinux modules to core PRODUCT_PACKAGES"

Browse Source 
* commit '392bdc1f08eb03ad04eba24a76cc0aea7e1b46d6':
  Move the selinux modules to core PRODUCT_PACKAGES
This commit is contained in:
Ying Wang
2012-08-13 16:24:11 -07:00
committed by Android Git Automerger
parent d7547163d5 392bdc1f08
commit d3d0becac9
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/Makefile
View File

@@ -352,13 +352,9 @@ INTERNAL_RAMDISK_FILES := $(filter $(TARGET_ROOT_OUT)/%, \
BUILT_RAMDISK_TARGET := $(PRODUCT_OUT)/ramdisk.img BUILT_RAMDISK_TARGET := $(PRODUCT_OUT)/ramdisk.img
ifeq ($(HAVE_SELINUX),true)
SELINUX_DEPENDS := sepolicy file_contexts seapp_contexts property_contexts mac_permissions.xml
endif
# We just build this directly to the install location. # We just build this directly to the install location.
INSTALLED_RAMDISK_TARGET := $(BUILT_RAMDISK_TARGET) INSTALLED_RAMDISK_TARGET := $(BUILT_RAMDISK_TARGET)
$(INSTALLED_RAMDISK_TARGET): $(MKBOOTFS) $(INTERNAL_RAMDISK_FILES) $(SELINUX_DEPENDS) | $(MINIGZIP) $(INSTALLED_RAMDISK_TARGET): $(MKBOOTFS) $(INTERNAL_RAMDISK_FILES) | $(MINIGZIP)
$(call pretty,"Target ram disk: $@") $(call pretty,"Target ram disk: $@")
$(hide) $(MKBOOTFS) $(TARGET_ROOT_OUT) | $(MINIGZIP) > $@ $(hide) $(MKBOOTFS) $(TARGET_ROOT_OUT) | $(MINIGZIP) > $@
@@ -707,7 +703,7 @@ ifdef is_tests_build
# $(tests_MODULES)) # $(tests_MODULES))
endif endif
FULL_SYSTEMIMAGE_DEPS := $(INTERNAL_SYSTEMIMAGE_FILES) $(INTERNAL_USERIMAGES_DEPS) $(SELINUX_DEPENDS) FULL_SYSTEMIMAGE_DEPS := $(INTERNAL_SYSTEMIMAGE_FILES) $(INTERNAL_USERIMAGES_DEPS)
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# installed file list # installed file list
# Depending on anything that $(BUILT_SYSTEMIMAGE) depends on. # Depending on anything that $(BUILT_SYSTEMIMAGE) depends on.
@@ -1156,7 +1152,7 @@ INTERNAL_OTA_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name).zip
$(INTERNAL_OTA_PACKAGE_TARGET): KEY_CERT_PAIR := $(DEFAULT_KEY_CERT_PAIR) $(INTERNAL_OTA_PACKAGE_TARGET): KEY_CERT_PAIR := $(DEFAULT_KEY_CERT_PAIR)
$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) $(SELINUX_DEPENDS) $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS)
@echo "Package OTA: $@" @echo "Package OTA: $@"
$(hide) ./build/tools/releasetools/ota_from_target_files -v \ $(hide) ./build/tools/releasetools/ota_from_target_files -v \
-p $(HOST_OUT) \ -p $(HOST_OUT) \
@@ -1184,7 +1180,7 @@ else
$(INTERNAL_UPDATE_PACKAGE_TARGET): extensions := $(TARGET_RELEASETOOLS_EXTENSIONS) $(INTERNAL_UPDATE_PACKAGE_TARGET): extensions := $(TARGET_RELEASETOOLS_EXTENSIONS)
endif endif
$(INTERNAL_UPDATE_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) $(SELINUX_DEPENDS) $(INTERNAL_UPDATE_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS)
@echo "Package: $@" @echo "Package: $@"
$(hide) ./build/tools/releasetools/img_from_target_files -v \ $(hide) ./build/tools/releasetools/img_from_target_files -v \
-s $(extensions) \ -s $(extensions) \

9
target/product/core.mk
View File

@@ -148,3 +148,12 @@ ifeq ($(WITH_HOST_DALVIK),true)
zoneinfo-host.idx \ zoneinfo-host.idx \
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