diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-04-12 01:09:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-12 01:09:46 +0000 |
| commit | 043a7a6182870964021476484b1534106ff20600 (patch) | |
| tree | 5ee5a79c77bf61c5c49a2f75668fbaf3f02c16ec /runtime/gc | |
| parent | 95cd06622b956d7cd5b65248b1f381e602753f2c (diff) | |
| parent | 7840888bd9b6accdb32c38563e78a9dc201f1303 (diff) | |
| download | art-043a7a6182870964021476484b1534106ff20600.zip art-043a7a6182870964021476484b1534106ff20600.tar.gz art-043a7a6182870964021476484b1534106ff20600.tar.bz2 | |
Merge "Fix hammerhead phone boot on master."
Diffstat (limited to 'runtime/gc')
| -rw-r--r-- | runtime/gc/heap.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ Heap::Heap(size_t initial_size, size_t growth_limit, size_t min_free, size_t max 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; |