Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9eb4d74e authored by Bo Hu's avatar Bo Hu
Browse files

Revert "Renames sepolicy files from nonplat_* to vendor_*" 

This reverts commit 38c404c6.
Reason for revert: broke mac build

b/70273082

FAILED: out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil
/bin/bash -c "(out/host/darwin-x86/bin/version_policy -b out/target/product/generic_x86/obj/FAKE/selinux_policy_intermediates/plat_pub_policy.cil -t out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_policy_raw.cil -n 10000.0 -o out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil.tmp ) && (grep -Fxv -f out/target/product/generic_x86/obj/ETC/plat_pub_versioned.cil_intermediates/plat_pub_versioned.cil out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil.tmp > out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil ) && (out/host/darwin-x86/bin/secilc -m -M true -G -N -c 30 		out/target/product/generic_x86/obj/ETC/plat_sepolicy.cil_intermediates/plat_sepolicy.cil out/target/product/generic_x86/obj/ETC/plat_pub_versioned.cil_intermediates/plat_pub_versioned.cil out/target/product/generic_x86/obj/ETC/10000.0.cil_intermediates/10000.0.cil out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil -o /dev/null -f /dev/null )"
Parsing out/target/product/generic_x86/obj/FAKE/selinux_policy_intermediates/plat_pub_policy.cil
Parsing out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_policy_raw.cil
grep: out of memory

Change-Id: I5b043fc6b5939456184ffb296cd00b3943a899f9
parent 5f03da04

core/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -1133,10 +1133,9 @@ recovery_initrc := $(call include-path-for, recovery)/etc/init.rc 
recovery_sepolicy := \

    $(TARGET_RECOVERY_ROOT_OUT)/sepolicy \

    $(TARGET_RECOVERY_ROOT_OUT)/plat_file_contexts \

    $(TARGET_RECOVERY_ROOT_OUT)/vendor_file_contexts \

    $(TARGET_RECOVERY_ROOT_OUT)/nonplat_file_contexts \

    $(TARGET_RECOVERY_ROOT_OUT)/plat_property_contexts \

    $(TARGET_RECOVERY_ROOT_OUT)/vendor_property_contexts



    $(TARGET_RECOVERY_ROOT_OUT)/nonplat_property_contexts

# Passed into rsync from non-recovery root to recovery root, to avoid overwriting recovery-specific

# SELinux files

IGNORE_RECOVERY_SEPOLICY := $(patsubst $(TARGET_RECOVERY_OUT)/%,--exclude=/%,$(recovery_sepolicy))