diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-10-17 09:02:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-17 09:02:30 +0000 |
| commit | 301861c7b93d5cb9463c7efdf0e30511a2ae79dd (patch) | |
| tree | 6c5c7865c0dd9834893d63f7facb149a2261c856 /runtime/jni_internal.cc | |
| parent | 2c341abc4f616e9d711376e621e7b2b5d8b38d1b (diff) | |
| parent | cb142101f29a4f1e097f03a220db3da6d4bd679f (diff) | |
| download | art-301861c7b93d5cb9463c7efdf0e30511a2ae79dd.zip art-301861c7b93d5cb9463c7efdf0e30511a2ae79dd.tar.gz art-301861c7b93d5cb9463c7efdf0e30511a2ae79dd.tar.bz2 | |
am cb142101: Merge "Add way to ensure we are at the front of the sigaction chain"
* commit 'cb142101f29a4f1e097f03a220db3da6d4bd679f':
Add way to ensure we are at the front of the sigaction chain
Diffstat (limited to 'runtime/jni_internal.cc')
| -rw-r--r-- | runtime/jni_internal.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/jni_internal.cc b/runtime/jni_internal.cc index 0bc519e..4f6abb7 100644 --- a/runtime/jni_internal.cc +++ b/runtime/jni_internal.cc @@ -30,6 +30,7 @@ #include "base/stl_util.h" #include "class_linker-inl.h" #include "dex_file-inl.h" +#include "fault_handler.h" #include "gc_root.h" #include "gc/accounting/card_table-inl.h" #include "indirect_reference_table-inl.h" |