commit d6f8c8b2773f08c08bb7d1658282a8891a1a52e2
author Roland Levillain <rpl@google.com> Tue Dec 18 15:27:28 2018 +0000
committer Roland Levillain <rpl@google.com> Tue Dec 18 17:20:44 2018 +0000
tree a98557d03f5c68e256b4adfe35eee67137525c86
parent 35bd06e1bd193f370422414a6e1027b61976351d

Fix `pthread_cond_timedwait()` error processing in dex2oat.

This function does not set `errno` on error; use the returned value as
error code instead.

Test: m dex2oat
Bug: 121130576
Change-Id: I32a2aeaef854930efac83e16fcb6a0a2d6f88090

dex2oat/dex2oat.cc

diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc
index 872fab3..0b2c0b6 100644
--- a/dex2oat/dex2oat.cc
+++ b/dex2oat/dex2oat.cc
@@ -601,8 +601,7 @@
         Fatal(StringPrintf("dex2oat did not finish after %" PRId64 " seconds",
                            timeout_in_milliseconds_/1000));
       } else if (rc != 0) {
-        std::string message(StringPrintf("pthread_cond_timedwait failed: %s",
-                                         strerror(errno)));
+        std::string message(StringPrintf("pthread_cond_timedwait failed: %s", strerror(rc)));
         Fatal(message.c_str());
       }
     }