commit dc1cd1037bf1b81c55b842b230fcc5f0d1e73003
author Kenny Root <kroot@google.com> Wed Oct 17 10:35:32 2012 -0700
committer Kenny Root <kroot@google.com> Wed Oct 17 10:35:32 2012 -0700
tree 483082b002427e9fd5a2e595765fbc4f94f36c92
parent b8404a7de94c109e3c17b4205b5f8aaae996eb33

Remove HAVE_SELINUX guards

Change-Id: Ibbf8ecff5dad3936be9b0788039381810a9c2c77

src/native/dalvik_system_Zygote.cc

diff --git a/src/native/dalvik_system_Zygote.cc b/src/native/dalvik_system_Zygote.cc
index 68ae7db..5fb435c 100644
--- a/src/native/dalvik_system_Zygote.cc
+++ b/src/native/dalvik_system_Zygote.cc
@@ -36,9 +36,7 @@
 #include <sys/prctl.h>
 #endif
 
-#if defined(HAVE_SELINUX)
 #include <selinux/android.h>
-#endif
 
 #if defined(__linux__)
 #include <sys/personality.h>
@@ -416,17 +414,17 @@
 
     SetSchedulerPolicy();
 
-#if defined(HAVE_SELINUX) && defined(HAVE_ANDROID_OS)
+#if defined(HAVE_ANDROID_OS)
     {
       ScopedUtfChars se_info(env, java_se_info);
-      CHECK(se_info != NULL);
+      CHECK(se_info.c_str() != NULL);
       ScopedUtfChars se_name(env, java_se_name);
-      CHECK(se_name != NULL);
-      rc = selinux_android_setcontext(uid, is_system_server, se_info, se_name);
+      CHECK(se_name.c_str() != NULL);
+      rc = selinux_android_setcontext(uid, is_system_server, se_info.c_str(), se_name.c_str());
       if (rc == -1) {
         PLOG(FATAL) << "selinux_android_setcontext(" << uid << ", "
                     << (is_system_server ? "true" : "false") << ", "
-                    << "\"" << se_info << "\", \"" << se_name << "\") failed";
+                    << "\"" << se_info.c_str() << "\", \"" << se_name.c_str() << "\") failed";
       }
     }
 #else