From 859ddfd23ccc2a37cfe182cf24e1cb3007bb237d Mon Sep 17 00:00:00 2001 From: Stephen Smalley Date: Wed, 1 Apr 2015 10:30:09 -0400 Subject: 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: Stephen Smalley --- BoardConfig.mk | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index e650b50..1c2db96 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -81,18 +81,6 @@ BOARD_CHARGER_DISABLE_INIT_BLANK := true TARGET_RECOVERY_UPDATER_LIBS += librecovery_updater_manta TARGET_RELEASETOOLS_EXTENSIONS := device/samsung/manta -BOARD_SEPOLICY_DIRS += \ - device/samsung/manta/sepolicy - -BOARD_SEPOLICY_UNION += \ - file_contexts \ - device.te \ - domain.te \ - drmserver.te \ - healthd.te \ - gpsd.te \ - file.te \ - mediaserver.te \ - system_server.te +BOARD_SEPOLICY_DIRS += device/samsung/manta/sepolicy MALLOC_IMPL := dlmalloc -- cgit v1.2.3