commit cd5b52ce853640170ede65ba4c49481e1ef362e7
author Sandeep Patil <sspatil@google.com> Mon Jan 30 19:24:57 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jan 30 19:24:57 2017 +0000
tree ba363295753369b0983bca7d1e430a438d3d5c4a
parent 84b4a987aa46969f33e20a9d75e5c66b87b455cd
parent 2845a2c7b5e014d1f93437c08dd237afce71bcb8

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

Change-Id: I2ae968586726bb8639dce914e5bc3f783f21d42e

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");