diff options
| author | 2015-11-30 23:00:33 +0000 | |
|---|---|---|
| committer | 2015-11-30 23:00:33 +0000 | |
| commit | 2e57aca33bd22cac7c0e66bdc11a90163b1718e9 (patch) | |
| tree | 4f3393583e8c7da6b370aa3ba61d1d7714349e0b /runtime/java_vm_ext.cc | |
| parent | 1850cb43dbddbc655a6f990a7d475587fa9d6659 (diff) | |
| parent | 2d902b99bba7ae1ad77ebeb038a4ef63c3ed6399 (diff) | |
Merge "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 7cc05f7cd4..58da7f285a 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()->GetAllocatorForClassLoader(loader); + Runtime::Current()->GetClassLinker()->GetOrCreateAllocatorForClassLoader(loader); CHECK(class_loader_allocator != nullptr); } if (library != nullptr) { |