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

Commit be13385e authored by Brett Chabot's avatar Brett Chabot Committed by android-build-merger
Browse files

Merge "Use Android systemTime implementation for host linux." am: c00229c3

am: ea51c307

Change-Id: Ibc28d59b80cd7cdd19656d83346665313052ef5e
parents 82e15285 ea51c307
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@
#include <limits.h>
#include <time.h>

#if defined(__ANDROID__)
// host linux support requires Linux 2.6.39+
#if defined(__linux__)
nsecs_t systemTime(int clock)
{
    static const clockid_t clocks[] = {
@@ -41,8 +42,7 @@ nsecs_t systemTime(int clock)
nsecs_t systemTime(int /*clock*/)
{
    // Clock support varies widely across hosts. Mac OS doesn't support
    // posix clocks, older glibcs don't support CLOCK_BOOTTIME and Windows
    // is windows.
    // CLOCK_BOOTTIME, and Windows is windows.
    struct timeval t;
    t.tv_sec = t.tv_usec = 0;
    gettimeofday(&t, nullptr);