diff options
| author | Tom Cherry <tomcherry@google.com> | 2017-06-23 23:15:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-23 23:15:21 +0000 |
| commit | d3d79b21968139b135ca24b13dd400494fe73965 (patch) | |
| tree | 7992591f17a63a176a8323a2ac398c89bc72c0e7 /init/builtins.cpp | |
| parent | bac524b0cd742c7a79ae9bf64152fae62ce7787b (diff) | |
| parent | 040212706bdff2efece95f4fc4fd8bee136657d6 (diff) | |
Merge "init: create android::init:: namespace"
am: 040212706b
Change-Id: Iff22100c7357ccc4a2a48c50b093375b5dd8a4b9
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 |