summaryrefslogtreecommitdiffstats
path: root/init/init.h
diff options
context:
space:
mode:
authorTom Cherry <tomcherry@google.com>2017-08-10 12:22:44 -0700
committerTom Cherry <tomcherry@google.com>2017-08-14 11:07:27 -0700
commitc317009410b9db48366d3eb85a5a18f0d1831048 (patch)
tree3d7854c258449cc59b67d61391526970bbdc34fe /init/init.h
parent1f6a481462ba334554680ef05932357fdf1b446c (diff)
downloadsystem_core-c317009410b9db48366d3eb85a5a18f0d1831048.tar.gz
system_core-c317009410b9db48366d3eb85a5a18f0d1831048.tar.bz2
system_core-c317009410b9db48366d3eb85a5a18f0d1831048.zip
init: split security functions out of init.cpp
This change splits out the selinux initialization and supporting functionality into selinux.cpp and splits the security related initialization of the rng, etc to security.cpp. It also provides additional documentation for SEPolicy loading as this has been requested by some teams. It additionally cleans up sehandle and sehandle_prop. The former is static within selinux.cpp and new wrapper functions are created around selabel_lookup*() to better serve the users. The latter is moved to property_service.cpp as it is isolated to that file for its usage. Test: boot bullhead Merged-In: Idc95d493cebc681fbe686b5160502f36af149f60 Change-Id: Idc95d493cebc681fbe686b5160502f36af149f60 (cherry picked from commit 9afb86b25d8675927cb37c86119a7ecf19f74819)
Diffstat (limited to 'init/init.h')
-rw-r--r--init/init.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/init/init.h b/init/init.h
index 92b9b7003..50a7c8352 100644
--- a/init/init.h
+++ b/init/init.h
@@ -18,8 +18,7 @@
#define _INIT_INIT_H
#include <string>
-
-#include <selinux/label.h>
+#include <vector>
#include "action.h"
#include "parser.h"
@@ -33,8 +32,6 @@ namespace init {
// TODO: Have an Init class and remove all globals.
extern const char *ENV[32];
extern std::string default_console;
-extern struct selabel_handle *sehandle;
-extern struct selabel_handle *sehandle_prop;
extern std::vector<std::string> late_import_paths;