diff options
| author | 2018-12-19 10:42:21 +0000 | |
|---|---|---|
| committer | 2018-12-19 10:42:21 +0000 | |
| commit | dadba138d745b1fb77da581f2d51fee20ccbac37 (patch) | |
| tree | 201f8395807fab69ae86fbcaafe21ee827c44dd4 | |
| parent | 96453b7d6aa445c6609aa465df5d66ae0beb7956 (diff) | |
| parent | d6f8c8b2773f08c08bb7d1658282a8891a1a52e2 (diff) | |
Merge "Fix `pthread_cond_timedwait()` error processing in dex2oat."
| -rw-r--r-- | dex2oat/dex2oat.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index 872fab3768..0b2c0b6749 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc @@ -601,8 +601,7 @@ class WatchDog { 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()); } } |