diff options
| author | 2015-12-01 01:20:12 +0000 | |
|---|---|---|
| committer | 2015-12-01 01:20:12 +0000 | |
| commit | e51e3f988ba91f0469757738fa55f835e16e37d9 (patch) | |
| tree | ca8b93da8be13d730ab88b4d4fe49144465d67a6 /runtime/java_vm_ext.cc | |
| parent | 996935e96137546cb3df5a63bc5aca477d58111f (diff) | |
| parent | 1ed1a1320c89a143a8139d331a05d47ed3db64f7 (diff) | |
Merge "Revert "Change LoadNativeLibrary to use GetOrCreateAllocator""
Diffstat (limited to 'runtime/java_vm_ext.cc')
| -rw-r--r-- | runtime/java_vm_ext.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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<mirror::ClassLoader*>(class_loader); class_loader_allocator = - Runtime::Current()->GetClassLinker()->GetOrCreateAllocatorForClassLoader(loader); + Runtime::Current()->GetClassLinker()->GetAllocatorForClassLoader(loader); CHECK(class_loader_allocator != nullptr); } if (library != nullptr) { |