diff options
| author | 2016-05-02 21:31:49 +0000 | |
|---|---|---|
| committer | 2016-05-02 21:31:49 +0000 | |
| commit | a6513729ae2ad0d2f9dd21d77ea6cf9ed9fa6eef (patch) | |
| tree | 89c840f95751667139256587f55b222537cf62c8 /runtime/java_vm_ext.cc | |
| parent | 2f8d3a6d08436be37b8087d7c7bb34b2b8e10e0e (diff) | |
| parent | 5edb063fc050bad66fe4ae41c93f6d08b0ccccfe (diff) | |
Merge changes from topic 'reset-native-loader'
* changes:
Fix check_jni_compiler tests
Revert "Disable tests after latest nativeloader changes."
Reset NativeLoader on DestroyJavaVM
Diffstat (limited to 'runtime/java_vm_ext.cc')
| -rw-r--r-- | runtime/java_vm_ext.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/java_vm_ext.cc b/runtime/java_vm_ext.cc index 35bb3c3301..79c320309c 100644 --- a/runtime/java_vm_ext.cc +++ b/runtime/java_vm_ext.cc @@ -318,6 +318,7 @@ class JII { } JavaVMExt* raw_vm = reinterpret_cast<JavaVMExt*>(vm); delete raw_vm->GetRuntime(); + android::ResetNativeLoader(); return JNI_OK; } |