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

Commit 5699c6cf authored by Stephen Smalley's avatar Stephen Smalley
Browse files

Drop BOARD_SEPOLICY_UNION. 

As suggested in the comments on
https://android-review.googlesource.com/#/c/141560/


drop BOARD_SEPOLICY_UNION and simplify the build_policy logic.
Union all files found under BOARD_SEPOLICY_DIRS.

Change-Id: I4214893c999c23631f5456cb1b8edd59771ef13b
Signed-off-by: default avatarStephen Smalley <sds@tycho.nsa.gov>
parent d64b853a

target/board/generic/BoardConfig.mk

+0 −16
Original line number Diff line number Diff line
@@ -76,22 +76,6 @@ BOARD_FLASH_BLOCK_SIZE := 512 
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true



BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy

BOARD_SEPOLICY_UNION += \

        bootanim.te \

        device.te \

        domain.te \

        file.te \

        file_contexts \

        goldfish_setup.te \

        goldfish_logcat.te \

        property.te \

        property_contexts \

        qemu_props.te \

        qemud.te \

        rild.te \

        shell.te \

        surfaceflinger.te \

        system_server.te



ifeq ($(TARGET_PRODUCT),sdk)

  # include an expanded selection of fonts for the SDK.

target/board/generic_mips/BoardConfig.mk

+0 −16
Original line number Diff line number Diff line
@@ -61,19 +61,3 @@ BOARD_FLASH_BLOCK_SIZE := 512 
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true



BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy
 
BOARD_SEPOLICY_UNION += \

        bootanim.te \

        device.te \

        domain.te \

        file.te \

        file_contexts \

        goldfish_setup.te \

        goldfish_logcat.te \

        property.te \

        property_contexts \

        qemu_props.te \

        qemud.te \

        rild.te \

        shell.te \

        surfaceflinger.te \

        system_server.te

target/board/generic_x86/BoardConfig.mk

+0 −18
Original line number Diff line number Diff line
@@ -45,21 +45,3 @@ TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true 
BOARD_SEPOLICY_DIRS += \

        build/target/board/generic/sepolicy \

        build/target/board/generic_x86/sepolicy
 


BOARD_SEPOLICY_UNION += \

        device.te \

        domain.te \

        file.te \

        file_contexts \

        healthd.te \

        installd.te \

        goldfish_setup.te \

        goldfish_logcat.te \

        property.te \

        property_contexts \

        qemu_props.te \

        qemud.te \

        rild.te \

        shell.te \

        system_server.te \

        zygote.te