commit 81f5d3ebef2c3789737bf718fc2a2cdd7b9e8b33
author Tom Cherry <tomcherry@google.com> Thu Jun 22 12:53:17 2017 -0700
committer Tom Cherry <tomcherry@google.com> Fri Jun 23 13:21:20 2017 -0700
tree 994dda570ae23534eb95913a17747e2f90f4ad7b
parent 84c2eebbdd889fdb7208069c48ba06a2b5a71bf4

init: create android::init:: namespace

With some small fixups along the way

Test: Boot bullhead
Test: init unit tests
Change-Id: I7beaa473cfa9397f845f810557d1631b4a462d6a

init/capabilities.cpp

diff --git a/init/capabilities.cpp b/init/capabilities.cpp
index b8a9ec0..53832a4 100644
--- a/init/capabilities.cpp
+++ b/init/capabilities.cpp
@@ -25,6 +25,9 @@
 
 #define CAP_MAP_ENTRY(cap) { #cap, CAP_##cap }
 
+namespace android {
+namespace init {
+
 static const std::map<std::string, int> cap_map = {
     CAP_MAP_ENTRY(CHOWN),
     CAP_MAP_ENTRY(DAC_OVERRIDE),
@@ -192,3 +195,6 @@
     // See http://man7.org/linux/man-pages/man7/capabilities.7.html.
     return SetAmbientCaps(to_keep);
 }
+
+}  // namespace init
+}  // namespace android