summaryrefslogtreecommitdiffstats
path: root/target/board/generic
diff options
context:
space:
mode:
authordcashman <dcashman@google.com>2014-06-16 18:11:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-16 18:11:30 +0000
commit4b445e89989845b5e8109caf96a8f32d8d7fe788 (patch)
tree81dfb2745faa5db9a60d49f3c53bbad904c0ec90 /target/board/generic
parentbc00c26f66820e2bbd730de64387a698463c2c38 (diff)
parent3aeceecddf2c7ee7f785e7e16c54d8bb99e3c9f1 (diff)
downloadbuild-4b445e89989845b5e8109caf96a8f32d8d7fe788.zip
build-4b445e89989845b5e8109caf96a8f32d8d7fe788.tar.gz
build-4b445e89989845b5e8109caf96a8f32d8d7fe788.tar.bz2
am 3aeceecd: am cd978db2: am 96df14d6: Merge "Allow all domains access to /dev/qemu_trace."
* commit '3aeceecddf2c7ee7f785e7e16c54d8bb99e3c9f1': Allow all domains access to /dev/qemu_trace.
Diffstat (limited to 'target/board/generic')
-rw-r--r--target/board/generic/BoardConfig.mk6
-rw-r--r--target/board/generic/sepolicy/adbd.te1
-rw-r--r--target/board/generic/sepolicy/app.te1
-rw-r--r--target/board/generic/sepolicy/bootanim.te1
-rw-r--r--target/board/generic/sepolicy/domain.te1
-rw-r--r--target/board/generic/sepolicy/mediaserver.te1
-rw-r--r--target/board/generic/sepolicy/rild.te1
-rw-r--r--target/board/generic/sepolicy/surfaceflinger.te1
-rw-r--r--target/board/generic/sepolicy/system_server.te1
-rw-r--r--target/board/generic/sepolicy/zygote.te1
10 files changed, 2 insertions, 13 deletions
diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk
index 6d58b1c..62303d6 100644
--- a/target/board/generic/BoardConfig.mk
+++ b/target/board/generic/BoardConfig.mk
@@ -77,17 +77,13 @@ TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy
BOARD_SEPOLICY_UNION += \
- adbd.te \
- app.te \
bootanim.te \
device.te \
domain.te \
file.te \
file_contexts \
- mediaserver.te \
qemud.te \
rild.te \
shell.te \
surfaceflinger.te \
- system_server.te \
- zygote.te
+ system_server.te
diff --git a/target/board/generic/sepolicy/adbd.te b/target/board/generic/sepolicy/adbd.te
deleted file mode 100644
index f65cfb3..0000000
--- a/target/board/generic/sepolicy/adbd.te
+++ /dev/null
@@ -1 +0,0 @@
-allow adbd qemu_device:chr_file rw_file_perms;
diff --git a/target/board/generic/sepolicy/app.te b/target/board/generic/sepolicy/app.te
deleted file mode 100644
index fd33453..0000000
--- a/target/board/generic/sepolicy/app.te
+++ /dev/null
@@ -1 +0,0 @@
-allow appdomain qemu_device:chr_file rw_file_perms;
diff --git a/target/board/generic/sepolicy/bootanim.te b/target/board/generic/sepolicy/bootanim.te
index a5a84f9..d6506e1 100644
--- a/target/board/generic/sepolicy/bootanim.te
+++ b/target/board/generic/sepolicy/bootanim.te
@@ -1,3 +1,2 @@
allow bootanim self:process execmem;
allow bootanim ashmem_device:chr_file execute;
-allow bootanim qemu_device:chr_file rw_file_perms;
diff --git a/target/board/generic/sepolicy/domain.te b/target/board/generic/sepolicy/domain.te
index f026100..c28ca74 100644
--- a/target/board/generic/sepolicy/domain.te
+++ b/target/board/generic/sepolicy/domain.te
@@ -1,2 +1,3 @@
# For /sys/qemu_trace files in the emulator.
allow domain sysfs_writable:file rw_file_perms;
+allow domain qemu_device:chr_file rw_file_perms;
diff --git a/target/board/generic/sepolicy/mediaserver.te b/target/board/generic/sepolicy/mediaserver.te
deleted file mode 100644
index 90b8cf8..0000000
--- a/target/board/generic/sepolicy/mediaserver.te
+++ /dev/null
@@ -1 +0,0 @@
-allow mediaserver qemu_device:chr_file rw_file_perms;
diff --git a/target/board/generic/sepolicy/rild.te b/target/board/generic/sepolicy/rild.te
index 5de171a..e148b6c 100644
--- a/target/board/generic/sepolicy/rild.te
+++ b/target/board/generic/sepolicy/rild.te
@@ -1,2 +1 @@
-allow rild qemu_device:chr_file rw_file_perms;
unix_socket_connect(rild, qemud, qemud)
diff --git a/target/board/generic/sepolicy/surfaceflinger.te b/target/board/generic/sepolicy/surfaceflinger.te
index 6712789..4c35469 100644
--- a/target/board/generic/sepolicy/surfaceflinger.te
+++ b/target/board/generic/sepolicy/surfaceflinger.te
@@ -1,3 +1,2 @@
allow surfaceflinger self:process execmem;
allow surfaceflinger ashmem_device:chr_file execute;
-allow surfaceflinger qemu_device:chr_file rw_file_perms;
diff --git a/target/board/generic/sepolicy/system_server.te b/target/board/generic/sepolicy/system_server.te
index ef4ce4a..d0fb79d 100644
--- a/target/board/generic/sepolicy/system_server.te
+++ b/target/board/generic/sepolicy/system_server.te
@@ -1,2 +1 @@
unix_socket_connect(system_server, qemud, qemud)
-allow system_server qemu_device:chr_file rw_file_perms;
diff --git a/target/board/generic/sepolicy/zygote.te b/target/board/generic/sepolicy/zygote.te
deleted file mode 100644
index a5da574..0000000
--- a/target/board/generic/sepolicy/zygote.te
+++ /dev/null
@@ -1 +0,0 @@
-allow zygote qemu_device:chr_file rw_file_perms;