summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Grinberg <dmitrygr@gmail.com>2015-11-04 10:22:01 +0000
committerSteve Kondik <shade@chemlab.org>2015-11-07 01:24:29 -0800
commit487963318e176f5e63d7e32475bfe93cf3c2decd (patch)
tree574885a7958d999bcab05022f67a2d707fccf311
parentd43903f4094c4791dc7664cf981086e608174bff (diff)
downloadart-487963318e176f5e63d7e32475bfe93cf3c2decd.zip
art-487963318e176f5e63d7e32475bfe93cf3c2decd.tar.gz
art-487963318e176f5e63d7e32475bfe93cf3c2decd.tar.bz2
dex2oat: Increase timeout to allow slow CPUs to finish compilation
Change-Id: Ib9f19e0acf1a0a5b90d8b7ef2a0daf224cb2aec1
-rw-r--r--dex2oat/dex2oat.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc
index d466a9b..18a5a45 100644
--- a/dex2oat/dex2oat.cc
+++ b/dex2oat/dex2oat.cc
@@ -436,8 +436,8 @@ class WatchDog {
// Debug builds are slower so they have larger timeouts.
static constexpr int64_t kSlowdownFactor = kIsDebugBuild ? 5U : 1U;
- // 10 minutes scaled by kSlowdownFactor.
- static constexpr int64_t kWatchDogTimeoutSeconds = kSlowdownFactor * 10 * 60;
+ // 60 minutes scaled by kSlowdownFactor.
+ static constexpr int64_t kWatchDogTimeoutSeconds = kSlowdownFactor * 60 * 60;
bool is_watch_dog_enabled_;
bool shutting_down_;