diff options
author | Tom Cherry <tomcherry@google.com> | 2017-06-23 23:07:21 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-06-23 23:07:23 +0000 |
commit | 040212706bdff2efece95f4fc4fd8bee136657d6 (patch) | |
tree | 7992591f17a63a176a8323a2ac398c89bc72c0e7 /init/builtins.cpp | |
parent | 45b4fe454a4414af8ea52cf7583b1adba0cef2a6 (diff) | |
parent | 81f5d3ebef2c3789737bf718fc2a2cdd7b9e8b33 (diff) |
Merge "init: create android::init:: namespace"
Diffstat (limited to 'init/builtins.cpp')
-rw-r--r-- | init/builtins.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp index c78bec7db..00ffbc3d2 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -67,6 +67,9 @@ using namespace std::literals::string_literals; #define chmod DO_NOT_USE_CHMOD_USE_FCHMODAT_SYMLINK_NOFOLLOW +namespace android { +namespace init { + static constexpr std::chrono::nanoseconds kCommandRetryTimeout = 5s; static int insmod(const char *filename, const char *options, int flags) { @@ -924,3 +927,6 @@ const BuiltinFunctionMap::Map& BuiltinFunctionMap::map() const { // clang-format on return builtin_functions; } + +} // namespace init +} // namespace android |