tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "Add build dependencies for split sepolicy files."" am: cbdc0bd096

Browse source 
am: 5e8be7b822

Change-Id: I6b1e6db6a505f8a65879228dc8fa9b1863724ca1
This commit is contained in:
Daniel Cashman 2016-12-17 01:16:42 +00:00 committed by android-build-merger
commit 6549a83888
2 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
core/Makefile
View file

@ -900,12 +900,7 @@ INTERNAL_RECOVERYIMAGE_FILES := $(filter $(TARGET_RECOVERY_OUT)/%, \
$(ALL_DEFAULT_INSTALLED_MODULES)) $(ALL_DEFAULT_INSTALLED_MODULES))
recovery_initrc := $(call include-path-for, recovery)/etc/init.rc recovery_initrc := $(call include-path-for, recovery)/etc/init.rc
recovery_mapping_sepolicy := \ recovery_sepolicy := $(call intermediates-dir-for,ETC,sepolicy.recovery)/sepolicy.recovery
$(call intermediates-dir-for,ETC,mapping_sepolicy.recovery.cil)/mapping_sepolicy.recovery.cil
recovery_nonplat_sepolicy := \
$(call intermediates-dir-for,ETC,nonplat_sepolicy.recovery.cil)/nonplat_sepolicy.recovery.cil
recovery_plat_sepolicy := \
$(call intermediates-dir-for,ETC,plat_sepolicy.recovery.cil)/plat_sepolicy.recovery.cil
recovery_kernel := $(INSTALLED_KERNEL_TARGET) # same as a non-recovery system recovery_kernel := $(INSTALLED_KERNEL_TARGET) # same as a non-recovery system
recovery_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.img recovery_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.img
recovery_build_prop := $(intermediate_system_build_prop) recovery_build_prop := $(intermediate_system_build_prop)
@ -1026,12 +1021,8 @@ define build-recoveryimage-target
@echo Modifying ramdisk contents... @echo Modifying ramdisk contents...
$(hide) rm -f $(TARGET_RECOVERY_ROOT_OUT)/init*.rc $(hide) rm -f $(TARGET_RECOVERY_ROOT_OUT)/init*.rc
$(hide) cp -f $(recovery_initrc) $(TARGET_RECOVERY_ROOT_OUT)/ $(hide) cp -f $(recovery_initrc) $(TARGET_RECOVERY_ROOT_OUT)/
$(hide) rm -f $(TARGET_RECOVERY_ROOT_OUT)/mapping_sepolicy.cil $(hide) rm -f $(TARGET_RECOVERY_ROOT_OUT)/sepolicy
$(hide) rm -f $(TARGET_RECOVERY_ROOT_OUT)/nonplat_sepolicy.cil $(hide) cp -f $(recovery_sepolicy) $(TARGET_RECOVERY_ROOT_OUT)/sepolicy
$(hide) rm -f $(TARGET_RECOVERY_ROOT_OUT)/plat_sepolicy.cil
$(hide) cp -f $(recovery_mapping_sepolicy) $(TARGET_RECOVERY_ROOT_OUT)/mapping_sepolicy.cil
$(hide) cp -f $(recovery_nonplat_sepolicy) $(TARGET_RECOVERY_ROOT_OUT)/nonplat_sepolicy.cil
$(hide) cp -f $(recovery_plat_sepolicy) $(TARGET_RECOVERY_ROOT_OUT)/plat_sepolicy.cil
$(hide) cp $(TARGET_ROOT_OUT)/init.recovery.*.rc $(TARGET_RECOVERY_ROOT_OUT)/ || true # Ignore error when the src file doesn't exist. $(hide) cp $(TARGET_ROOT_OUT)/init.recovery.*.rc $(TARGET_RECOVERY_ROOT_OUT)/ || true # Ignore error when the src file doesn't exist.
$(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/res $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/res
$(hide) rm -rf $(TARGET_RECOVERY_ROOT_OUT)/res/* $(hide) rm -rf $(TARGET_RECOVERY_ROOT_OUT)/res/*
@ -1085,8 +1076,7 @@ endif
$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \ $(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \
$(INSTALLED_RAMDISK_TARGET) \ $(INSTALLED_RAMDISK_TARGET) \
$(INTERNAL_RECOVERYIMAGE_FILES) \ $(INTERNAL_RECOVERYIMAGE_FILES) \
$(recovery_initrc) $(recovery_mapping_sepolicy) $(recovery_nonplat_sepolicy) \ $(recovery_initrc) $(recovery_sepolicy) $(recovery_kernel) \
$(recovery_plat_sepolicy) $(recovery_kernel) \
$(INSTALLED_2NDBOOTLOADER_TARGET) \ $(INSTALLED_2NDBOOTLOADER_TARGET) \
$(recovery_build_prop) $(recovery_resource_deps) \ $(recovery_build_prop) $(recovery_resource_deps) \
$(recovery_fstab) \ $(recovery_fstab) \
@ -1099,8 +1089,7 @@ $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \
$(INSTALLED_RAMDISK_TARGET) \ $(INSTALLED_RAMDISK_TARGET) \
$(INSTALLED_BOOTIMAGE_TARGET) \ $(INSTALLED_BOOTIMAGE_TARGET) \
$(INTERNAL_RECOVERYIMAGE_FILES) \ $(INTERNAL_RECOVERYIMAGE_FILES) \
$(recovery_initrc) $(recovery_mapping_sepolicy) $(recovery_nonplat_sepolicy) \ $(recovery_initrc) $(recovery_sepolicy) $(recovery_kernel) \
$(recovery_plat_sepolicy) $(recovery_kernel) \
$(INSTALLED_2NDBOOTLOADER_TARGET) \ $(INSTALLED_2NDBOOTLOADER_TARGET) \
$(recovery_build_prop) $(recovery_resource_deps) \ $(recovery_build_prop) $(recovery_resource_deps) \
$(recovery_fstab) \ $(recovery_fstab) \

4
target/product/embedded.mk
View file

@ -80,14 +80,12 @@ PRODUCT_PACKAGES += \
# SELinux packages # SELinux packages
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
file_contexts.bin \ file_contexts.bin \
mapping_sepolicy.cil \
nonplat_mac_permissions.xml \ nonplat_mac_permissions.xml \
nonplat_sepolicy.cil \
plat_mac_permissions.xml \ plat_mac_permissions.xml \
plat_sepolicy.cil \
property_contexts \ property_contexts \
seapp_contexts \ seapp_contexts \
selinux_version \ selinux_version \
sepolicy \
service_contexts service_contexts
# Ensure that this property is always defined so that bionic_systrace.cpp # Ensure that this property is always defined so that bionic_systrace.cpp