commit 482f36cf74c0461bbad4a33df27d1b8e72ccc2d2
author Tom Cherry <tomcherry@google.com> Mon May 08 13:38:15 2017 -0700
committer Tom Cherry <tomcherry@google.com> Tue May 09 02:25:32 2017 +0000
tree d0ade431b56e65db325e9b777d10fa7810185b59
parent cc22a8e5a25e63fa61e1236ef4df28bfea05be35

init: remove restorecon() from util.cpp

restorecon() has become nothing more than a small wrapper around
selinux_android_restore().  This itself isn't super problematic, but
it is an obstacle for compiling util.cpp on the host as that function
is not available on the host.

Bug: 36970783
Test: Boot bullhead
Merged-In: I7e209ece6898f9a0d5eb9e5d5d8155c2f1ba9faf
Change-Id: I7e209ece6898f9a0d5eb9e5d5d8155c2f1ba9faf

init/devices.cpp

diff --git a/init/devices.cpp b/init/devices.cpp
index 74f099a..d8258cf 100644
--- a/init/devices.cpp
+++ b/init/devices.cpp
@@ -251,7 +251,7 @@
 
     if (access(path.c_str(), F_OK) == 0) {
         LOG(VERBOSE) << "restorecon_recursive: " << path;
-        restorecon(path.c_str(), SELINUX_ANDROID_RESTORECON_RECURSE);
+        selinux_android_restorecon(path.c_str(), SELINUX_ANDROID_RESTORECON_RECURSE);
     }
 }