Merge "init: create android::init:: namespace" am: 040212706b

am: d3d79b2196

Change-Id: I3dccff251dda7d7452e33a7e71178c59f0c22169

1 files changed, 10 insertions, 1 deletions

diff --git a/init/init.cpp b/init/init.cpp
index 9c6b5802a..501298cd5 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -48,7 +48,6 @@
 #include <libavb/libavb.h>
 #include <private/android_filesystem_config.h>
 #include <selinux/android.h>
-#include <selinux/label.h>
 #include <selinux/selinux.h>
 
 #include <fstream>
@@ -75,6 +74,9 @@ using namespace std::string_literals;
 using android::base::boot_clock;
 using android::base::GetProperty;
 
+namespace android {
+namespace init {
+
 struct selabel_handle *sehandle;
 struct selabel_handle *sehandle_prop;
 
@@ -1187,3 +1189,10 @@ int main(int argc, char** argv) {
 
     return 0;
 }
+
+}  // namespace init
+}  // namespace android
+
+int main(int argc, char** argv) {
+    android::init::main(argc, argv);
+}