commit 776a802be39cb4a2267b6371764d46ce1fc23e74
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jun 03 14:06:02 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 03 14:06:02 2016 +0000
tree 043eda310bce8a420a6ec64cebb4602f3a2449aa
parent 6591101bcb3117ca48a707f35c507a92ba6c72c2
parent d0f0281176916b0ec513ac95edbd0b3040398bb9

Merge "Revert "Revert "Make the boot image non-debuggable."""

dex2oat/dex2oat.cc

diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc
index cce83f3..db26799 100644
--- a/dex2oat/dex2oat.cc
+++ b/dex2oat/dex2oat.cc
@@ -685,12 +685,6 @@
       Usage("Can't have both --image and (--app-image-fd or --app-image-file)");
     }
 
-    if (IsBootImage()) {
-      // We need the boot image to always be debuggable.
-      // TODO: Remove this once we better deal with full frame deoptimization.
-      compiler_options_->debuggable_ = true;
-    }
-
     if (oat_filenames_.empty() && oat_fd_ == -1) {
       Usage("Output must be supplied with either --oat-file or --oat-fd");
     }