summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2015-04-01 19:13:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-01 19:13:31 +0000
commitead02d1129347fe0b570a64cb2192cb9b2bed401 (patch)
tree99b8df5a06dd7f25f78883144b59fa9efa81a52e
parent57df23e40a55a31dc8c0d084dde7a7d52cac7621 (diff)
parent9160c60f136bafc9b8c07252e5814950eff33a20 (diff)
downloadbuild-ead02d1129347fe0b570a64cb2192cb9b2bed401.zip
build-ead02d1129347fe0b570a64cb2192cb9b2bed401.tar.gz
build-ead02d1129347fe0b570a64cb2192cb9b2bed401.tar.bz2
am 9160c60f: am 4e94ed11: am 2d47488e: Merge "Drop BOARD_SEPOLICY_UNION."
* commit '9160c60f136bafc9b8c07252e5814950eff33a20': Drop BOARD_SEPOLICY_UNION.
-rw-r--r--target/board/generic/BoardConfig.mk16
-rw-r--r--target/board/generic_mips/BoardConfig.mk16
-rw-r--r--target/board/generic_x86/BoardConfig.mk18
3 files changed, 0 insertions, 50 deletions
diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk
index e06c985..393492b 100644
--- a/target/board/generic/BoardConfig.mk
+++ b/target/board/generic/BoardConfig.mk
@@ -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.
diff --git a/target/board/generic_mips/BoardConfig.mk b/target/board/generic_mips/BoardConfig.mk
index b40f9ba..13d1c9f 100644
--- a/target/board/generic_mips/BoardConfig.mk
+++ b/target/board/generic_mips/BoardConfig.mk
@@ -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
diff --git a/target/board/generic_x86/BoardConfig.mk b/target/board/generic_x86/BoardConfig.mk
index 78b7590..d5f0531 100644
--- a/target/board/generic_x86/BoardConfig.mk
+++ b/target/board/generic_x86/BoardConfig.mk
@@ -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