Compile with -mstackrealign on Android-x86, "fixing" mystery crashes on Zenfone.

This is really just a workaround, I have no idea what is misaligning the stack. But it doesn't feel like it's us.

This has a small performance penalty but x86-Android is pretty rare, and it's better than crashing.
This commit is contained in:
Henrik Rydgard 2015-07-20 20:17:35 +02:00
parent 11f64ee27b
commit 1c8bae0925
2 changed files with 2 additions and 2 deletions

View File

@ -46,7 +46,7 @@ ifeq ($(TARGET_ARCH_ABI),x86)
LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/x86/lib/libavutil.a
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../ffmpeg/android/x86/include
LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_ARCH_32 -D_M_IX86 -fomit-frame-pointer -mtune=atom -mfpmath=sse -mssse3
LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_ARCH_32 -D_M_IX86 -fomit-frame-pointer -mtune=atom -mfpmath=sse -mssse3 -mstackrealign
endif
ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/arm64/lib/libavformat.a

2
native

@ -1 +1 @@
Subproject commit 477568b3485e9921ede59c26b266c762b1fbd066
Subproject commit a9cefe2f3ad5c9f9af6e19af06e54e082cbbb9d5