commit 4684522a14c7c24291e61c34b9f0760074ac966b
author Tom Cherry <tomcherry@google.com> Fri Dec 11 14:28:09 2015 -0800
committer Tom Cherry <tomcherry@google.com> Wed Dec 16 17:42:08 2015 -0800
tree 70458868d5cab10b980487f17800977bde0de2a1
parent 99983f7de78cd7f52a193b45c1e9c361c49c304e

Use selinux_android_setcon() instead of setcon()

Bug 26114086

Change-Id: I02d20ee7a5f487fc73d7a33d50b0b8f1cd9ad3a4

daemon/main.cpp

diff --git a/daemon/main.cpp b/daemon/main.cpp
index 240985f..53117d6 100644
--- a/daemon/main.cpp
+++ b/daemon/main.cpp
@@ -29,7 +29,7 @@
 #include <android-base/stringprintf.h>
 #include "cutils/properties.h"
 #include "private/android_filesystem_config.h"
-#include "selinux/selinux.h"
+#include "selinux/android.h"
 
 #include "adb.h"
 #include "adb_auth.h"
@@ -137,7 +137,7 @@
         D("Local port disabled");
     } else {
         if (root_seclabel != nullptr) {
-            if (setcon(root_seclabel) < 0) {
+            if (selinux_android_setcon(root_seclabel) < 0) {
                 LOG(FATAL) << "Could not set SELinux context";
             }
         }