Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ca8a3e9 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "base: chrono_utils: supported in linux" am: 142303b9 am: 8b8fc5cf am: 415f9b86 

am: 30fccc6d

Change-Id: Iebc6ae0d0e5de9d8359c7e90e038d7dc5c814ed3
parents 0f3b86c9 30fccc6d

base/chrono_utils.cpp

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ namespace android { 
namespace base {



boot_clock::time_point boot_clock::now() {

#ifdef __ANDROID__

#ifdef __linux__

  timespec ts;

  clock_gettime(CLOCK_BOOTTIME, &ts);

  return boot_clock::time_point(std::chrono::seconds(ts.tv_sec) +
@@ -30,7 +30,7 @@ boot_clock::time_point boot_clock::now() { 
#else

  // Darwin does not support clock_gettime.

  return boot_clock::time_point();

#endif  // __ANDROID__

#endif  // __linux__

}



std::ostream& operator<<(std::ostream& os, const Timer& t) {