am 2eb95ac2: am ad6107c3: Merge "Coalesce generic_x86 and generic sepolicy where possible."

* commit '2eb95ac202429d930545043d742ab443bedbf357':
  Coalesce generic_x86 and generic sepolicy where possible.
This commit is contained in:
Nick Kralevich 2014-06-17 16:56:57 +00:00 committed by Android Git Automerger
commit f9172a61d7
9 changed files with 4 additions and 19 deletions

View file

@ -42,7 +42,10 @@ BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
BOARD_FLASH_BLOCK_SIZE := 512
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
BOARD_SEPOLICY_DIRS += build/target/board/generic_x86/sepolicy
BOARD_SEPOLICY_DIRS += \
build/target/board/generic/sepolicy \
build/target/board/generic_x86/sepolicy
BOARD_SEPOLICY_UNION += \
device.te \
domain.te \

View file

@ -1 +0,0 @@
type qemu_device, dev_type;

View file

@ -1,4 +1 @@
# For /sys/qemu_trace files in the emulator.
allow domain sysfs_writable:file rw_file_perms;
allow domain cpuctl_device:dir search;
allow domain qemu_device:chr_file rw_file_perms;

View file

@ -1 +0,0 @@
type qemud_socket, file_type;

View file

@ -1,4 +0,0 @@
/dev/qemu_.* u:object_r:qemu_device:s0
/dev/socket/qemud u:object_r:qemud_socket:s0
/system/bin/qemud u:object_r:qemud_exec:s0
/sys/qemu_trace(/.*)? -- u:object_r:sysfs_writable:s0

View file

@ -1,6 +0,0 @@
# qemu support daemon
type qemud, domain;
type qemud_exec, exec_type, file_type;
init_daemon_domain(qemud)
unconfined_domain(qemud)

View file

@ -1 +0,0 @@
unix_socket_connect(rild, qemud, qemud)

View file

@ -1 +0,0 @@
allow shell serial_device:chr_file rw_file_perms;

View file

@ -1,2 +1 @@
allow system_server self:process execmem;
unix_socket_connect(system_server, qemud, qemud)