commit 73c67e630dd5ced65d617f89fadad42140e1c5f2
author Nick Kralevich <nnk@google.com> Wed Apr 16 13:54:45 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 16 13:54:45 2014 +0000
tree 3270f1615da23b37da416820c35d262d9bb1e4ba
parent 591ea1e1bce45f1ef4f64dc2fd6b7f45dc54c075
parent f3bc587a26194acce4aba00a49f02f823171a654

Merge "Drop SELinux labeling of functionfs."

BoardConfig.mk

diff --git a/BoardConfig.mk b/BoardConfig.mk
index f79bf8c..a2bf303 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -87,8 +87,6 @@
 
 BOARD_SEPOLICY_UNION += \
 	file_contexts \
-	genfs_contexts \
-	adbd.te \
 	device.te \
 	domain.te \
 	drmserver.te \

sepolicy/adbd.te

diff --git a/sepolicy/adbd.te b/sepolicy/adbd.te
deleted file mode 100644
index 3855987..0000000
--- a/sepolicy/adbd.te
+++ /dev/null
@@ -1,2 +0,0 @@
-allow adbd ffs:file rw_file_perms;
-allow adbd ffs:dir search;

sepolicy/file.te

diff --git a/sepolicy/file.te b/sepolicy/file.te
index fe128dd..cabfe13 100644
--- a/sepolicy/file.te
+++ b/sepolicy/file.te
@@ -1,3 +1 @@
-type ffs, fs_type;
-
 type sysfs_charge_enabled, fs_type, sysfs_type;

sepolicy/genfs_contexts

diff --git a/sepolicy/genfs_contexts b/sepolicy/genfs_contexts
deleted file mode 100644
index 17ddc45..0000000
--- a/sepolicy/genfs_contexts
+++ /dev/null
@@ -1 +0,0 @@
-genfscon functionfs / u:object_r:ffs:s0