commit cefeec0d00e7718a1638c74769107c90327ea572
author Sandeep Patil <sspatil@google.com> Wed Jan 18 06:26:57 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 18 06:26:57 2017 +0000
tree 5fe16c94b7ab5f5cae6824d237d9baa0595f9fe4
parent c0b5ceaae55ed8e1b5c61c2efdd6da27acdb967a
parent fe002c86d3e2dc0053b6e3454ad1223847b45109

init: split property context into platform & non-platform components am: 871c306855 am: ca1bcdb286
am: 4bf0a38e72

Change-Id: I1490c82306caf867f792cf1fa6a26a8dc7845066

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