diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2014-07-15 17:16:13 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-07-15 17:16:13 +0000 |
| commit | b2f067cf4776e1f5511a124378f62f8666b23bc5 (patch) | |
| tree | 34538e6ecc25bd18b4e5471c899af77cf13db307 | |
| parent | e5b874388cf9877bed83f43d6fe64a996367e581 (diff) | |
| parent | f1dac7d7e74fff6e92c2d74eb5d9e6793ee19087 (diff) | |
| download | latinime-b2f067cf4776e1f5511a124378f62f8666b23bc5.tar.gz latinime-b2f067cf4776e1f5511a124378f62f8666b23bc5.tar.xz latinime-b2f067cf4776e1f5511a124378f62f8666b23bc5.zip | |
am f1dac7d7: am 81a48d47: Add -mstackrealign to avoid crashes with SSE instructions on pre-K x86 devices.
* commit 'f1dac7d7e74fff6e92c2d74eb5d9e6793ee19087':
Add -mstackrealign to avoid crashes with SSE instructions on pre-K x86 devices.
| -rw-r--r-- | native/jni/Android.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/native/jni/Android.mk b/native/jni/Android.mk index 72f8f87e4..8be4d78b6 100644 --- a/native/jni/Android.mk +++ b/native/jni/Android.mk @@ -34,6 +34,12 @@ LOCAL_CFLAGS += -Werror -Wall -Wextra -Weffc++ -Wformat=2 -Wcast-qual -Wcast-ali # To suppress compiler warnings for unused variables/functions used for debug features etc. LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function +# HACK: -mstackrealign is required for x86 builds running on pre-KitKat devices to avoid crashes +# with SSE instructions. +ifeq ($(TARGET_ARCH), x86) + LOCAL_CFLAGS += -mstackrealign +endif # x86 + include $(LOCAL_PATH)/NativeFileList.mk LOCAL_SRC_FILES := \ |