commit 491ca9e75fad381468dd7f5fdbff56d1a9738dd7
author Brian Carlstrom <bdc@google.com> Sun Mar 02 18:24:38 2014 -0800
committer Brian Carlstrom <bdc@google.com> Mon Mar 03 13:31:40 2014 -0800
tree 4a88d05188aebbcbe868a27b58fc1a932f914ce2
parent 82e3a8ef9cd776d7026b45fe7fb6c72bcfd61394

Add ART -help and -showversion

Bug: https://code.google.com/p/android/issues/detail?id=62149
Change-Id: I5c21c0433f5f341f94e7d977e8d2d69cc46d6fe3

runtime/trace.cc

diff --git a/runtime/trace.cc b/runtime/trace.cc
index 18185d4..1f24478 100644
--- a/runtime/trace.cc
+++ b/runtime/trace.cc
@@ -115,11 +115,7 @@
 static const uint16_t kTraceRecordSizeSingleClock = 10;  // using v2
 static const uint16_t kTraceRecordSizeDualClock   = 14;  // using v3 with two timestamps
 
-#if defined(HAVE_POSIX_CLOCKS)
-ProfilerClockSource Trace::default_clock_source_ = kProfilerClockSourceDual;
-#else
-ProfilerClockSource Trace::default_clock_source_ = kProfilerClockSourceWall;
-#endif
+ProfilerClockSource Trace::default_clock_source_ = kDefaultProfilerClockSource;
 
 Trace* volatile Trace::the_trace_ = NULL;
 pthread_t Trace::sampling_pthread_ = 0U;