commit e1d490cb55a0cad78fc0607e62370e3de9c37fce
author Ian Rogers <irogers@google.com> Fri Feb 03 09:09:07 2012 -0800
committer Ian Rogers <irogers@google.com> Fri Feb 03 09:09:07 2012 -0800
tree e3d29ca9490f1b87feacb7569c33463b30697eb5
parent 763d5fb2f83d9c93b5b764533005865a3d1034e1

Don't request a heap trim in dex2oat

Change-Id: I5711b8825ccdb68c1e57fe8f85729c723cd11994

src/heap.cc

diff --git a/src/heap.cc b/src/heap.cc
index 2b5be9c..cda2202 100644
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -730,6 +730,10 @@
     // (This percentage was picked arbitrarily.)
     return;
   }
+  if (!Runtime::Current()->IsStarted()) {
+    // Heap trimming isn't supported without a Java runtime (such as at dex2oat time)
+    return;
+  }
   JNIEnv* env = Thread::Current()->GetJniEnv();
   static jclass Daemons_class = CacheClass(env, "java/lang/Daemons");
   static jmethodID Daemons_requestHeapTrim = env->GetStaticMethodID(Daemons_class, "requestHeapTrim", "()V");