commit 72a85fb0a3469ef5efa28a4aaca5071c085aba23
author Sandeep Patil <sspatil@google.com> Mon Jan 30 19:28:59 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jan 30 19:28:59 2017 +0000
tree 5cdfb383e66d9390b3687b3d5450752c5d63ed84
parent 80aa72022f960bfa6aa6b55cbfe2a3ee997356e1
parent cd5b52ce853640170ede65ba4c49481e1ef362e7

init: split property context into platform & non-platform components am: 7a5db4ec7f am: a0f91e8efc
am: a4607a2e0c

Change-Id: I85e54f4bdab68d0de1737ba894163512c45acf4a

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index e7772e7..850a904 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -811,7 +811,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");