diff options
| author | 2017-03-18 02:51:37 +0000 | |
|---|---|---|
| committer | 2017-03-18 02:51:37 +0000 | |
| commit | 33dca562d5ed9f52f63ced2334c066333ca073e9 (patch) | |
| tree | b13ca4ec329595953d3aa3b04b0323f2dee173ca /runtime/java_vm_ext.cc | |
| parent | 7600fa9234e02cf5108a3a82babf3d3ab82fcddd (diff) | |
Revert "Make sigchain actually own the signal chain."
This reverts commit 7600fa9234e02cf5108a3a82babf3d3ab82fcddd.
Change-Id: Ia46db2a7df0c0ac07107a8db06f42ff1afd4a97e
Diffstat (limited to 'runtime/java_vm_ext.cc')
| -rw-r--r-- | runtime/java_vm_ext.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/runtime/java_vm_ext.cc b/runtime/java_vm_ext.cc index b93b8f2a97..a341cdb89f 100644 --- a/runtime/java_vm_ext.cc +++ b/runtime/java_vm_ext.cc @@ -39,7 +39,6 @@ #include "runtime_options.h" #include "ScopedLocalRef.h" #include "scoped_thread_state_change-inl.h" -#include "sigchain.h" #include "thread-inl.h" #include "thread_list.h" @@ -901,8 +900,7 @@ bool JavaVMExt::LoadNativeLibrary(JNIEnv* env, int version = (*jni_on_load)(this, nullptr); if (runtime_->GetTargetSdkVersion() != 0 && runtime_->GetTargetSdkVersion() <= 21) { - // Make sure that sigchain owns SIGSEGV. - EnsureFrontOfChain(SIGSEGV); + fault_manager.EnsureArtActionInFrontOfSignalChain(); } self->SetClassLoaderOverride(old_class_loader.get()); |