diff options
| author | Tom Cherry <tomcherry@google.com> | 2017-06-23 23:19:53 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-23 23:19:53 +0000 |
| commit | b57e1180e36e44b78f45c03d98d62c22754d591c (patch) | |
| tree | d87252e55756a56380cde35c6fbca9042b1c7723 /init/builtins.cpp | |
| parent | 56f021f0a40a88cfa98c432f8ee4f43e25e301df (diff) | |
| parent | d3d79b21968139b135ca24b13dd400494fe73965 (diff) | |
Merge "init: create android::init:: namespace" am: 040212706b
am: d3d79b2196
Change-Id: I3dccff251dda7d7452e33a7e71178c59f0c22169
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 |