From 8680e9849f5e3dc1d89911016d11642142fe369f Mon Sep 17 00:00:00 2001 From: James Chen Date: Fri, 20 Jan 2017 16:28:39 +0800 Subject: [PATCH] Disable ASM for tremolo since it may crashes while decoding same specific ogg audio files. --- sources/tremolo/Android.mk | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/sources/tremolo/Android.mk b/sources/tremolo/Android.mk index 6fad9e78..331f3356 100644 --- a/sources/tremolo/Android.mk +++ b/sources/tremolo/Android.mk @@ -16,21 +16,22 @@ LOCAL_SRC_FILES = \ Tremolo/treminfo.c \ Tremolo/vorbisfile.c -ifeq ($(TARGET_ARCH),arm) -LOCAL_SRC_FILES += \ - Tremolo/bitwiseARM.s \ - Tremolo/dpen.s \ - Tremolo/floor1ARM.s \ - Tremolo/mdctARM.s -LOCAL_CFLAGS += \ - -D_ARM_ASSEM_ -# Assembly code in asm_arm.h does not compile with Clang. -LOCAL_CLANG_ASFLAGS_arm += \ - -no-integrated-as -else +# Disable arm optimization which will cause the issue https://github.com/cocos2d/cocos2d-x/issues/17148 +# ifeq ($(TARGET_ARCH),arm) +# LOCAL_SRC_FILES += \ +# Tremolo/bitwiseARM.s \ +# Tremolo/dpen.s \ +# Tremolo/floor1ARM.s \ +# Tremolo/mdctARM.s +# LOCAL_CFLAGS += \ +# -D_ARM_ASSEM_ +# # Assembly code in asm_arm.h does not compile with Clang. +# LOCAL_CLANG_ASFLAGS_arm += \ +# -no-integrated-as +# else LOCAL_CFLAGS += \ -DONLY_C -endif +# endif LOCAL_CFLAGS+= -O2 LOCAL_C_INCLUDES:= \