diff options
| author | James Hawkins <jhawkins@google.com> | 2017-02-06 10:46:54 -0800 |
|---|---|---|
| committer | James Hawkins <jhawkins@google.com> | 2017-02-07 15:43:32 -0800 |
| commit | 26f40c04c3ad80e2bc449990010d39d1c1b9a5f0 (patch) | |
| tree | dc8aae8ca90822f9f9f578c40255fc7c93db76df /init/init.cpp | |
| parent | 564aeca94e18cd708f93619551e05b3d59d4abe2 (diff) | |
| download | system_core-26f40c04c3ad80e2bc449990010d39d1c1b9a5f0.tar.gz system_core-26f40c04c3ad80e2bc449990010d39d1c1b9a5f0.tar.bz2 system_core-26f40c04c3ad80e2bc449990010d39d1c1b9a5f0.zip | |
bootstat: Remove custom uptime parser in favor of elapsedRealtime.
Refactored init/utils/boot_clock into base/chrono_utils.
Bug: 34352037
Test: none
Change-Id: Ied0c00867336b85922369d7ff37520e3d28fc61e
Diffstat (limited to 'init/init.cpp')
| -rw-r--r-- | init/init.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/init/init.cpp b/init/init.cpp index 43f601f69..4af0656c0 100644 --- a/init/init.cpp +++ b/init/init.cpp @@ -40,6 +40,7 @@ #include <selinux/label.h> #include <selinux/android.h> +#include <android-base/chrono_utils.h> #include <android-base/file.h> #include <android-base/stringprintf.h> #include <android-base/strings.h> @@ -68,6 +69,7 @@ #include "util.h" #include "watchdogd.h" +using android::base::boot_clock; using android::base::StringPrintf; struct selabel_handle *sehandle; @@ -750,7 +752,7 @@ int main(int argc, char** argv) { return watchdogd_main(argc, argv); } - boot_clock::time_point start_time = boot_clock::now(); + boot_clock::time_point start_time = android::base::boot_clock::now(); // Clear the umask. umask(0); |