summaryrefslogtreecommitdiff
path: root/init/descriptors.cpp
diff options
context:
space:
mode:
authorTom Cherry <tomcherry@google.com>2017-06-23 23:19:53 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-06-23 23:19:53 +0000
commitb57e1180e36e44b78f45c03d98d62c22754d591c (patch)
treed87252e55756a56380cde35c6fbca9042b1c7723 /init/descriptors.cpp
parent56f021f0a40a88cfa98c432f8ee4f43e25e301df (diff)
parentd3d79b21968139b135ca24b13dd400494fe73965 (diff)
Merge "init: create android::init:: namespace" am: 040212706b
am: d3d79b2196 Change-Id: I3dccff251dda7d7452e33a7e71178c59f0c22169
Diffstat (limited to 'init/descriptors.cpp')
-rw-r--r--init/descriptors.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/init/descriptors.cpp b/init/descriptors.cpp
index ed65a055a..0cb639a91 100644
--- a/init/descriptors.cpp
+++ b/init/descriptors.cpp
@@ -31,6 +31,9 @@
#include "init.h"
#include "util.h"
+namespace android {
+namespace init {
+
DescriptorInfo::DescriptorInfo(const std::string& name, const std::string& type, uid_t uid,
gid_t gid, int perm, const std::string& context)
: name_(name), type_(type), uid_(uid), gid_(gid), perm_(perm), context_(context) {
@@ -126,3 +129,6 @@ int FileInfo::Create(const std::string&) const {
const std::string FileInfo::key() const {
return ANDROID_FILE_ENV_PREFIX;
}
+
+} // namespace init
+} // namespace android