diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-03-06 11:11:48 -0800 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-03-06 11:43:06 -0800 |
| commit | 6dda898d47b3e8931e4404330e81b7110108e34f (patch) | |
| tree | d8a0a20b8ac1ce3cd44273cf5c748d09980bd800 /runtime/native/dalvik_system_VMRuntime.cc | |
| parent | 8785d615122d4abbd22db702139584e8c472f502 (diff) | |
| download | art-6dda898d47b3e8931e4404330e81b7110108e34f.tar.gz art-6dda898d47b3e8931e4404330e81b7110108e34f.tar.bz2 art-6dda898d47b3e8931e4404330e81b7110108e34f.zip | |
Disable compaction for jni workarounds.
Compaction can't work when jni workarounds is enabled. Also some
other refactoring.
Change-Id: Ia7b0f2b39c79f5a0a5f50874d823b950ab02a0c3
Diffstat (limited to 'runtime/native/dalvik_system_VMRuntime.cc')
| -rw-r--r-- | runtime/native/dalvik_system_VMRuntime.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/native/dalvik_system_VMRuntime.cc b/runtime/native/dalvik_system_VMRuntime.cc index f48e8ad07a..87165561ed 100644 --- a/runtime/native/dalvik_system_VMRuntime.cc +++ b/runtime/native/dalvik_system_VMRuntime.cc @@ -177,6 +177,8 @@ static void VMRuntime_setTargetSdkVersionNative(JNIEnv* env, jobject, jint targe << targetSdkVersion << "..."; vm->work_around_app_jni_bugs = true; + LOG(WARNING) << "Permenantly disabling heap compaction due to jni workarounds"; + Runtime::Current()->GetHeap()->DisableCompaction(); } } } |