diff options
| author | Tom Cherry <tomcherry@google.com> | 2017-07-10 18:32:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-10 18:32:54 +0000 |
| commit | 78a6ff26a0da29c618450a69c424a080148a875e (patch) | |
| tree | 3dd41bd37928dcff4f9adc25ce0594b563fba147 /init/builtins.cpp | |
| parent | 2fca6301e27087bab4fbf98e6e466f7695cd1cac (diff) | |
| parent | dd5d30562a6e9914b96e9ab0a3f9cca0950f2757 (diff) | |
Merge "Move Timer from init to libbase" am: 896297b2ef
am: 7ff0b008f7
Change-Id: I3d1dd6eabbf17d701eefbf7363bfe6107d4de8a4
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 75a8f19723..dfd7b73d28 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> @@ -538,9 +539,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 */ |