summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andreas Gampe <agampe@google.com> 2014-08-09 01:20:01 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2014-08-09 00:52:40 +0000
commitf0d54278d02a69e659432fa1cf2e8a8b388565da (patch)
tree1554c307b8e7c8ec24b6ab2d7b1a497b04663322
parentc5ec29d29a2044454900290e3ccc8f092ab201d1 (diff)
parentbf40ddb83e1ea05ba4bc101149cd79f0160c8996 (diff)
Merge "ART: Turn on dex2oat watchdog on target"
-rw-r--r--dex2oat/dex2oat.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc
index bb86a74b34..403cb80674 100644
--- a/dex2oat/dex2oat.cc
+++ b/dex2oat/dex2oat.cc
@@ -850,7 +850,7 @@ static int dex2oat(int argc, char** argv) {
bool include_patch_information = CompilerOptions::kDefaultIncludePatchInformation;
bool include_debug_symbols = kIsDebugBuild;
bool dump_slow_timing = kIsDebugBuild;
- bool watch_dog_enabled = !kIsTargetBuild;
+ bool watch_dog_enabled = true;
bool generate_gdb_information = kIsDebugBuild;
// Checks are all explicit until we know the architecture.