diff options
| author | Josh Gao <jmgao@google.com> | 2017-04-28 12:39:48 -0700 |
|---|---|---|
| committer | Josh Gao <jmgao@google.com> | 2017-04-28 13:00:00 -0700 |
| commit | ae29339ca138648eeaee68f801feb02d85ee2abf (patch) | |
| tree | fae72a160e4812f326207e25b40a167980d649fd /base/chrono_utils.cpp | |
| parent | 263e1e95093b9f66b7d62cbd622e09b6a8b9252f (diff) | |
base: make boot_clock work on host linux, hide it on non-linux.
boot_clock was previously returning zero on any platform that doesn't
define __ANDROID__, including host bionic. Instead of returning a bogus
value, just hide it on non-Linux platforms.
Bug: http://b/37758947
Test: libbase_test32/64 on linux
Change-Id: I96e1d8b92dc44c6308408900cf0d27e1e7db5569
Diffstat (limited to 'base/chrono_utils.cpp')
| -rw-r--r-- | base/chrono_utils.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/base/chrono_utils.cpp b/base/chrono_utils.cpp index 5eedf3bceb..d73b551b50 100644 --- a/base/chrono_utils.cpp +++ b/base/chrono_utils.cpp @@ -21,17 +21,14 @@ namespace android { namespace base { +#if defined(__linux__) boot_clock::time_point boot_clock::now() { -#ifdef __ANDROID__ timespec ts; clock_gettime(CLOCK_BOOTTIME, &ts); return boot_clock::time_point(std::chrono::seconds(ts.tv_sec) + std::chrono::nanoseconds(ts.tv_nsec)); -#else - // Darwin does not support clock_gettime. - return boot_clock::time_point(); -#endif // __ANDROID__ } +#endif } // namespace base } // namespace android |