commit f0d54278d02a69e659432fa1cf2e8a8b388565da
author Andreas Gampe <agampe@google.com> Sat Aug 09 01:20:01 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Aug 09 00:52:40 2014 +0000
tree 1554c307b8e7c8ec24b6ab2d7b1a497b04663322
parent c5ec29d29a2044454900290e3ccc8f092ab201d1
parent bf40ddb83e1ea05ba4bc101149cd79f0160c8996

Merge "ART: Turn on dex2oat watchdog on target"

dex2oat/dex2oat.cc

diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc
index bb86a74..403cb80 100644
--- a/dex2oat/dex2oat.cc
+++ b/dex2oat/dex2oat.cc
@@ -850,7 +850,7 @@
   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.