Merge "Fix bug #37284906, adb shell crashes on windows with invalid options. For example, "adb.exe shell -list" crashes without this fix. Test: adb.exe shell -list-packages"
diff --git a/init/selinux.cpp b/init/selinux.cpp
index b9305ed..dd49f84 100644
--- a/init/selinux.cpp
+++ b/init/selinux.cpp
@@ -68,10 +68,10 @@
namespace android {
namespace init {
-static struct selabel_handle* sehandle = nullptr;
-
namespace {
+selabel_handle* sehandle = nullptr;
+
enum EnforcingStatus { SELINUX_PERMISSIVE, SELINUX_ENFORCING };
EnforcingStatus StatusFromCmdline() {