commit caf1156709ac21587ea7e1c59198bc8ac0fd1fe8
author Adam Shih <adamshih@google.com> Tue Sep 22 08:04:09 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 22 08:04:09 2020 +0000
tree 122328c0c5e3d822c49a1ba7d4b1812873cd769e
parent 308a4f9a9ecbca0a047ae2ebafb0931bc76e4494
parent b7c0ec5d4566243b6f511d089960affd730b32d2

Merge "Move persist setting back to individual devices"

common/file.te

diff --git a/common/file.te b/common/file.te
index 3f4f23a..967bb9e 100644
--- a/common/file.te
+++ b/common/file.te
@@ -1,7 +1,4 @@
 type persist_file, file_type, vendor_persist_type;
-type firmware_file, file_type, contextmount_type, vendor_file_type;
 
 # kernel modules
 type vendor_kernel_modules, vendor_file_type, file_type;
-
-allow firmware_file self:filesystem associate;

common/file_contexts

diff --git a/common/file_contexts b/common/file_contexts
index e86fd9f..67fa1d7 100644
--- a/common/file_contexts
+++ b/common/file_contexts
@@ -1,5 +1,4 @@
 /mnt/vendor/persist(/.*)?       u:object_r:persist_file:s0
-/vendor/firmware_mnt(/.*)?      u:object_r:firmware_file:s0
 /persist(/.*)?                  u:object_r:persist_file:s0
 
 /vendor/bin/init\.insmod\.sh                        u:object_r:init-insmod-sh_exec:s0

common/init.te

diff --git a/common/init.te b/common/init.te
deleted file mode 100644
index 1ff76db..0000000
--- a/common/init.te
+++ /dev/null
@@ -1,2 +0,0 @@
-allow init firmware_file:dir mounton;
-allow init firmware_file:filesystem { getattr mount relabelfrom };