init: remove Parser singleton and related cleanup
* Remove the Parser singleton (Hooray!)
* Rename parser.* to tokenizer.* as this is actually a tokenizer
* Rename init_parser.* to parser.* as this is a generic parser
* Move contents of init_parser_test.cpp to service_test.cpp as this
actually is a test of the parsing in MakeExecOneshotService() and
nothing related to (init_)parser.cpp
Test: boot bullhead
Test: bool sailfish
Test: init unit tests
Change-Id: I4fe39e6483f58ebd3ce5ee715a45dbba0acf5d91
diff --git a/init/init.h b/init/init.h
index aaab523..0a77bd2 100644
--- a/init/init.h
+++ b/init/init.h
@@ -21,6 +21,10 @@
#include <selinux/label.h>
+#include "action.h"
+#include "parser.h"
+#include "service.h"
+
namespace android {
namespace init {
@@ -32,6 +36,10 @@
extern struct selabel_handle *sehandle;
extern struct selabel_handle *sehandle_prop;
+extern std::vector<std::string> late_import_paths;
+
+Parser CreateParser(ActionManager& action_manager, ServiceManager& service_manager);
+
void handle_control_message(const std::string& msg, const std::string& arg);
void property_changed(const std::string& name, const std::string& value);