commit 10fabb3b8c616c4a509e1e6ff23ad3ffea5eb46f
author Jorim Jaggi <jjaggi@google.com> Wed Jan 18 16:27:03 2017 +0100
committer Jorim Jaggi <jjaggi@google.com> Wed Jan 18 16:27:03 2017 +0100
tree 4d3fc2e403ae0b2acb1dd1eeb7a58e4f57b343ff
parent a6ef54922e9f9ca7feb74f2fde198ed76756aecc

Revert "init: split property context into platform & non-platform components"

This reverts commit 871c306855a558963329fdb4a1b61f3e53c2b367.

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 078fa8a..ee5add8 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -775,8 +775,7 @@
     restorecon("/dev/random");
     restorecon("/dev/urandom");
     restorecon("/dev/__properties__");
-    restorecon("/plat_property_contexts");
-    restorecon("/nonplat_property_contexts");
+    restorecon("/property_contexts");
     restorecon("/sys", SELINUX_ANDROID_RESTORECON_RECURSE);
     restorecon("/dev/block", SELINUX_ANDROID_RESTORECON_RECURSE);
     restorecon("/dev/device-mapper");