diff options
| author | Tom Cherry <tomcherry@google.com> | 2017-07-10 18:36:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-10 18:36:54 +0000 |
| commit | c0a9cf648bef5a5760bf78806d78a3ee8b64477a (patch) | |
| tree | e971662daeef0a53deaa92a452c15bce184ec67b /init/builtins.cpp | |
| parent | 3bfce07b86559e42dbfef80d66b08a0194b61c3a (diff) | |
| parent | 4e5c4f18d8a0612b73396822fd23dfd82411c0f7 (diff) | |
Merge "Move Timer from init to libbase" am: 896297b2ef am: 7ff0b008f7
am: 4e5c4f18d8
Change-Id: Iffad0dcde94fce7dac627ebf0530420f9cfd38d1
Diffstat (limited to 'init/builtins.cpp')
| -rw-r--r-- | init/builtins.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp index a9024bd23..56d0ae2c8 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -39,6 +39,7 @@ #include <sys/wait.h> #include <unistd.h> +#include <android-base/chrono_utils.h> #include <android-base/file.h> #include <android-base/logging.h> #include <android-base/parseint.h> @@ -555,9 +556,9 @@ static int do_mount_all(const std::vector<std::string>& args) { } std::string prop_name = "ro.boottime.init.mount_all."s + prop_post_fix; - Timer t; + android::base::Timer t; int ret = mount_fstab(fstabfile, mount_mode); - property_set(prop_name, std::to_string(t.duration_ms())); + property_set(prop_name, std::to_string(t.duration().count())); if (import_rc) { /* Paths of .rc files are specified at the 2nd argument and beyond */ |