From 1ed1a1320c89a143a8139d331a05d47ed3db64f7 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Tue, 1 Dec 2015 01:20:00 +0000 Subject: Revert "Change LoadNativeLibrary to use GetOrCreateAllocator" This reverts commit 2d902b99bba7ae1ad77ebeb038a4ef63c3ed6399. Change-Id: I4a674844f2f6d76d1c33741b46f12417ec7eab35 --- runtime/java_vm_ext.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/java_vm_ext.cc') diff --git a/runtime/java_vm_ext.cc b/runtime/java_vm_ext.cc index 58da7f285a..7cc05f7cd4 100644 --- a/runtime/java_vm_ext.cc +++ b/runtime/java_vm_ext.cc @@ -736,7 +736,7 @@ bool JavaVMExt::LoadNativeLibrary(JNIEnv* env, const std::string& path, jobject // it's okay to decode it without worrying about unexpectedly marking it alive. mirror::ClassLoader* loader = soa.Decode(class_loader); class_loader_allocator = - Runtime::Current()->GetClassLinker()->GetOrCreateAllocatorForClassLoader(loader); + Runtime::Current()->GetClassLinker()->GetAllocatorForClassLoader(loader); CHECK(class_loader_allocator != nullptr); } if (library != nullptr) { -- cgit v1.2.3-59-g8ed1b