diff options
| author | Tom Cherry <tomcherry@google.com> | 2017-06-23 23:24:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-23 23:24:21 +0000 |
| commit | 99d93f4462f5c7496dad313de0acc67b04e545c3 (patch) | |
| tree | d4b215ed636b43b8dad64579be03aecd32b2fafa /init/builtins.cpp | |
| parent | d47d328b416f7dab6a2f1b30c36f5a9bdde3a83e (diff) | |
| parent | b57e1180e36e44b78f45c03d98d62c22754d591c (diff) | |
Merge "init: create android::init:: namespace" am: 040212706b am: d3d79b2196
am: b57e1180e3
Change-Id: Ic6d35273820d70136a6085bf49dcf3afcbb24f24
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 91672f550..921ea9428 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) { @@ -941,3 +944,6 @@ const BuiltinFunctionMap::Map& BuiltinFunctionMap::map() const { // clang-format on return builtin_functions; } + +} // namespace init +} // namespace android |