commit f67cc149982cefdcf9f8697c9966c710f6512d23
author Elliott Hughes <enh@google.com> Tue Nov 25 23:23:45 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 25 23:23:45 2014 +0000
tree 1d6e8ff1b66502c5ada8c96d96b8ecc82544c5c5
parent 3ec380d365cbe5fac23ff19897512cf492a7a8a4
parent 2657717f97e0de689aa3d8cae75bb0053607839d

am 2657717f: Merge "We have POSIX clocks."

* commit '2657717f97e0de689aa3d8cae75bb0053607839d':
  We have POSIX clocks.

core/jni/android_os_SystemClock.cpp

diff --git a/core/jni/android_os_SystemClock.cpp b/core/jni/android_os_SystemClock.cpp
index 1d45605..dfe024e 100644
--- a/core/jni/android_os_SystemClock.cpp
+++ b/core/jni/android_os_SystemClock.cpp
@@ -60,18 +60,11 @@
 static jlong android_os_SystemClock_currentThreadTimeMillis(JNIEnv* env,
         jobject clazz)
 {
-#if defined(HAVE_POSIX_CLOCKS)
     struct timespec tm;
 
     clock_gettime(CLOCK_THREAD_CPUTIME_ID, &tm);
 
     return tm.tv_sec * 1000LL + tm.tv_nsec / 1000000;
-#else
-    struct timeval tv;
-
-    gettimeofday(&tv, NULL);
-    return tv.tv_sec * 1000LL + tv.tv_usec / 1000;
-#endif
 }
 
 /*
@@ -80,18 +73,11 @@
 static jlong android_os_SystemClock_currentThreadTimeMicro(JNIEnv* env,
         jobject clazz)
 {
-#if defined(HAVE_POSIX_CLOCKS)
     struct timespec tm;
 
     clock_gettime(CLOCK_THREAD_CPUTIME_ID, &tm);
 
     return tm.tv_sec * 1000000LL + tm.tv_nsec / 1000;
-#else
-    struct timeval tv;
-
-    gettimeofday(&tv, NULL);
-    return tv.tv_sec * 1000000LL + tv.tv_nsec / 1000;
-#endif
 }
 
 /*