diff options
| author | vng <viktor.govako@gmail.com> | 2016-08-09 15:09:26 +0300 |
|---|---|---|
| committer | alexzatsepin <az@mapswithme.com> | 2017-02-14 15:47:26 +0300 |
| commit | 57ab411abd42f5be6fb3689a62b82bd46d3468b1 (patch) | |
| tree | f24c74bfb6510c541391ca16a25ee2c930c78dd7 /tools/android | |
| parent | 1c7b0ae8d7e324a6f14a7840aabad261a2a577f5 (diff) | |
[android] Migrate to android-ndk-12x
Diffstat (limited to 'tools/android')
| -rw-r--r-- | tools/android/cxxabi.cc_patch | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/tools/android/cxxabi.cc_patch b/tools/android/cxxabi.cc_patch deleted file mode 100644 index 79412c529e..0000000000 --- a/tools/android/cxxabi.cc_patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Users/yunik/devtools/android-sdk/ndk-bundle/sources/cxx-stl/gabi++/src/cxxabi.cc b/android/../tools/android/cxxabi.cc -index 3f428d9..9c0e8bc 100644 ---- a/Users/yunik/devtools/android-sdk/ndk-bundle/sources/cxx-stl/gabi++/src/cxxabi.cc -+++ b/android/../tools/android/cxxabi.cc -@@ -296,7 +296,9 @@ namespace __cxxabiv1 { - - extern "C" void *__cxa_allocate_exception(size_t thrown_size) _GABIXX_NOEXCEPT { - size_t size = thrown_size + sizeof(__cxa_exception); -- __cxa_exception *buffer = static_cast<__cxa_exception*>(malloc(size)); -+ // Bugfix for crashes appearing on stack unwinding, taken from https://android-review.googlesource.com/#/c/182443/ -+ //__cxa_exception *buffer = static_cast<__cxa_exception*>(malloc(size)); -+ __cxa_exception *buffer = static_cast<__cxa_exception*>(memalign(__alignof__(__cxa_exception), size)); - if (!buffer) { - // Since Android uses memory-overcommit, we enter here only when - // the exception object is VERY large. This will propably never happen. |