commit 41961e2ad0aa064db9fefdd2a52368047961115a
author Mathieu Chartier <mathieuc@google.com> Tue May 06 16:24:35 2014 -0700
committer Mathieu Chartier <mathieuc@google.com> Tue May 06 16:28:24 2014 -0700
tree 576b9296c8df537b2bebfb89fa8dd621a28b335b
parent 0095e0b8380a8802f40a21928800b9df6e11f1d7

Fix device booting with DlMalloc instead of RosAlloc.

Change-Id: I347ef931e5c738937bcc50d7e8f4d5b3729fd3e4

runtime/gc/heap.cc

diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc
index 4484494..5d38b02 100644
--- a/runtime/gc/heap.cc
+++ b/runtime/gc/heap.cc
@@ -367,7 +367,7 @@
     dlmalloc_space_ = space::DlMallocSpace::CreateFromMemMap(
         mem_map, "main dlmalloc space", kDefaultStartingSize, initial_size, growth_limit, capacity,
         can_move_objects);
-    main_space_ = rosalloc_space_;
+    main_space_ = dlmalloc_space_;
     CHECK(main_space_ != nullptr) << "Failed to create dlmalloc space";
   }
   main_space_->SetFootprintLimit(main_space_->Capacity());