Commit: 81ce753ec0014fe404c4eec3ac6d04504356a638 - device-generic-x86 (git)

device/generic/x86

Commit MetaInfo

• Revision: 81ce753ec0014fe404c4eec3ac6d04504356a638 (tree)
• Time: 2015-04-02 04:09:34
• Author: Nick Kralevich <nnk@goog...>
• Commiter: Nick Kralevich

Log Message

resolved conflicts for merge of 6a9e1f6c to master

Change-Id: I8b985b27c132bf0808fbe4c0e7a095891e45a97a

Change Summary

• modified: BoardConfig.mk

Incremental Difference

--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -36,23 +36,3 @@ TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
 
 BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy
 BOARD_SEPOLICY_DIRS += build/target/board/generic_x86/sepolicy
-
-BOARD_SEPOLICY_UNION += \
-        bootanim.te \
-        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 \
-        surfaceflinger.te \
-        system_server.te \
-        zygote.te