commit 043a7a6182870964021476484b1534106ff20600
author Mathieu Chartier <mathieuc@google.com> Sat Apr 12 01:09:46 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Apr 12 01:09:46 2014 +0000
tree 5ee5a79c77bf61c5c49a2f75668fbaf3f02c16ec
parent 95cd06622b956d7cd5b65248b1f381e602753f2c
parent 7840888bd9b6accdb32c38563e78a9dc201f1303

Merge "Fix hammerhead phone boot on master."

runtime/gc/heap.cc

diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc
index 64dafe7..479ea2e 100644
--- a/runtime/gc/heap.cc
+++ b/runtime/gc/heap.cc
@@ -203,7 +203,7 @@
     non_moving_space_ = space::DlMallocSpace::Create(
         "zygote / non moving space", initial_size, kNonMovingSpaceCapacity, kNonMovingSpaceCapacity,
         requested_alloc_space_begin, false);
-    non_moving_space_->SetGrowthLimit(non_moving_space_->Capacity());
+    non_moving_space_->SetFootprintLimit(non_moving_space_->Capacity());
     CreateMainMallocSpace(mem_map, initial_size, growth_limit, capacity);
   } else {
     std::string error_str;