commit aa03ef26214767cc53d21be40d3027fc69684551
author Jorim Jaggi <jjaggi@google.com> Wed Jan 18 15:36:42 2017 +0000
committer Jorim Jaggi <jjaggi@google.com> Wed Jan 18 15:47:11 2017 +0000
tree 424251a3df60f5f4ccdeb4f1b98db13c00e4c309
parent 262edc382ae4da130b211203bf05c03179794616

Revert "property_context: split into platform and non-platform components."

This reverts commit 262edc382ae4da130b211203bf05c03179794616.

Fixes: 34370523
Change-Id: I077d064d4031d40bc48cb39eba310e6c16b9627d

private/file_contexts

diff --git a/private/file_contexts b/private/file_contexts
index 98a3c23..90124b7 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -41,8 +41,7 @@
 /mapping_sepolicy\.cil   u:object_r:rootfs:s0
 /nonplat_sepolicy\.cil   u:object_r:rootfs:s0
 /plat_sepolicy\.cil      u:object_r:rootfs:s0
-/plat_property_contexts  u:object_r:property_contexts:s0
-/nonplat_property_contexts  u:object_r:property_contexts:s0
+/property_contexts  u:object_r:property_contexts:s0
 /seapp_contexts     u:object_r:rootfs:s0
 /nonplat_seapp_contexts     u:object_r:rootfs:s0
 /plat_seapp_contexts     u:object_r:rootfs:s0