Merge "Restore end of dex2oat logging"
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc
index 97df199..582a0e9 100644
--- a/dex2oat/dex2oat.cc
+++ b/dex2oat/dex2oat.cc
@@ -180,7 +180,11 @@
~Dex2Oat() {
delete runtime_;
- VLOG(compiler) << "dex2oat took " << PrettyDuration(NanoTime() - start_ns_)
+ LogCompletionTime();
+ }
+
+ void LogCompletionTime() {
+ LOG(INFO) << "dex2oat took " << PrettyDuration(NanoTime() - start_ns_)
<< " (threads: " << thread_count_ << ")";
}
@@ -1189,6 +1193,7 @@
// Everything was successfully written, do an explicit exit here to avoid running Runtime
// destructors that take time (bug 10645725) unless we're a debug build or running on valgrind.
if (!kIsDebugBuild || (RUNNING_ON_VALGRIND == 0)) {
+ dex2oat->LogCompletionTime();
exit(EXIT_SUCCESS);
}