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

Commit 2eb95ac2 authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

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

* commit 'ad6107c3':
  Coalesce generic_x86 and generic sepolicy where possible.
parents 331f4d58 ad6107c3

target/board/generic_x86/BoardConfig.mk

+4 −1
Original line number Diff line number Diff line
@@ -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 \

target/board/generic_x86/sepolicy/device.te

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
type qemu_device, dev_type;

target/board/generic_x86/sepolicy/domain.te

+0 −3
Original line number Diff line number Diff line 
# 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;

target/board/generic_x86/sepolicy/file.te

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
type qemud_socket, file_type;

target/board/generic_x86/sepolicy/file_contexts

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
/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