commit b8e5553887e4599ee755da181c49b37281c1d878
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 18 06:09:02 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 18 06:09:02 2017 +0000
tree 6451bc80754f34bba3b6058d784034bdc10d71f6
parent 56098eed3b1e21f27cb232e7e98f9164a49202f6
parent 871c306855a558963329fdb4a1b61f3e53c2b367

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

init/init.cpp

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