commit 0f875ef27a4842d2e7c857b3c7eedbf8c8cf873f
author Mathieu Chartier <mathieuc@google.com> Tue Jan 14 15:49:54 2014 -0800
committer Mathieu Chartier <mathieuc@google.com> Tue Jan 14 15:51:15 2014 -0800
tree 97ec8ba6b3aca750a07b4376b54d0a6d1ea92bd4
parent 4289116517f765df84820bf753fbf891986f40ca

Revert accidental default collector type change.

Default collector type had been changed to generational semi-space
by default by accident.

Change-Id: I060b3f292261b8bb258ca2a350e26a328340c49c

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 3cdf289..2af569a 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -401,8 +401,7 @@
   // Only the main GC thread, no workers.
   parsed->conc_gc_threads_ = 0;
   // Default is CMS which is Sticky + Partial + Full CMS GC.
-  // parsed->collector_type_ = gc::kCollectorTypeCMS;
-  parsed->collector_type_ = gc::kCollectorTypeGSS;
+  parsed->collector_type_ = gc::kCollectorTypeCMS;
   // If background_collector_type_ is kCollectorTypeNone, it defaults to the collector_type_ after
   // parsing options.
   parsed->background_collector_type_ = gc::kCollectorTypeNone;