commit b7802898318f9b7d7e12ac24a225727d9e5909c2
author Narayan Kamath <narayan@google.com> Thu Oct 01 12:34:52 2015 +0100
committer Narayan Kamath <narayan@google.com> Thu Nov 12 11:52:47 2015 +0000
tree cb422a09dba964c07b0a47de652f5ffd8bdfc47d
parent 6c0ea2799f7dc8b8763c07a6e94c23590f6b54b5

Remove bogus reference to HAVE_POSIX_CLOCKS.

This is no longer defined, and we can assume that POSIX clocks
are available.

bug: 24556944

Change-Id: I14081aafa29f0fe2f9409307bbfef7d521c02f63

runtime/native/OpenjdkJvm.cc

diff --git a/runtime/native/OpenjdkJvm.cc b/runtime/native/OpenjdkJvm.cc
index 69bd221..25f1c55 100644
--- a/runtime/native/OpenjdkJvm.cc
+++ b/runtime/native/OpenjdkJvm.cc
@@ -472,16 +472,11 @@
 }
 
 JNIEXPORT jlong JVM_NanoTime(JNIEnv* env ATTRIBUTE_UNUSED, jclass unused ATTRIBUTE_UNUSED) {
-#if defined(HAVE_POSIX_CLOCKS)
-    timespec now;
-    clock_gettime(CLOCK_MONOTONIC, &now);
-    return now.tv_sec * 1000000000LL + now.tv_nsec;
-#else
-    timeval now;
-    gettimeofday(&now, NULL);
-    return static_cast<jlong>(now.tv_sec) * 1000000000LL + now.tv_usec * 1000LL;
-#endif
+  timespec now;
+  clock_gettime(CLOCK_MONOTONIC, &now);
+  return now.tv_sec * 1000000000LL + now.tv_nsec;
 }
+
 static void ThrowArrayStoreException_NotAnArray(const char* identifier, art::mirror::Object* array)
     SHARED_LOCKS_REQUIRED(art::Locks::mutator_lock_) {
   std::string actualType(art::PrettyTypeOf(array));