ART: Add Array.createObjectArray to unstarted runtime
Necessary for compile-time initialization of android.text.Layout.
Bug: 19542228
Change-Id: I4220c65fcc3a8aaa2765b6f07f1f81c330484244
diff --git a/runtime/native/java_lang_reflect_Array.cc b/runtime/native/java_lang_reflect_Array.cc
index 681b261..eddd7de 100644
--- a/runtime/native/java_lang_reflect_Array.cc
+++ b/runtime/native/java_lang_reflect_Array.cc
@@ -61,10 +61,8 @@
return NULL;
}
DCHECK(array_class->IsObjectArrayClass());
- mirror::Array* new_array = mirror::Array::Alloc<true>(
- soa.Self(), array_class, length,
- ComponentSizeShiftWidth(sizeof(mirror::HeapReference<mirror::Object>)),
- runtime->GetHeap()->GetCurrentAllocator());
+ mirror::Array* new_array = mirror::ObjectArray<mirror::Object*>::Alloc(
+ soa.Self(), array_class, length, runtime->GetHeap()->GetCurrentAllocator());
return soa.AddLocalReference<jobject>(new_array);
}