commit 81a48d47d1a6960169fa39edfaa710ffa687721f
author Ken Wakasa <kwakasa@google.com> Tue Jul 15 20:13:05 2014 +0900
committer Ken Wakasa <kwakasa@google.com> Tue Jul 15 20:26:55 2014 +0900
tree d9a3ae2a4e29b81315227d9e6f6d2ba1bb0b270b
parent 05c70484a2c9db94bc66bb740fee3c180b10b4ff

Add -mstackrealign to avoid crashes with SSE instructions on pre-K x86 devices.

bug: 16213554
Change-Id: Icd67ed4fd57fcc5f5bf8039b7892d0d446210247

native/jni/Android.mk

diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index 72f8f87..8be4d78 100644
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@@ -34,6 +34,12 @@
 # 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 := \