commit 1708655d68ca9b9800461fe90eed04e38bcfae20
author Marco Nelissen <marcone@google.com> Thu Jun 02 15:57:57 2016 -0700
committer Marco Nelissen <marcone@google.com> Thu Jun 02 15:57:57 2016 -0700
tree fce13fb0c285d49937781bcfefa0bfcd02672e45
parent 6fae62de61f2315ed43935682b59fe8a5d936cef

Turn off signed integer overflow checking for amrwbenc

which also requires turning off NEON code generation.

Bug: 28992582
Change-Id: I740adefc3f80ac8f66f72d289413d786fc39900c

media/libstagefright/codecs/amrwbenc/Android.mk

diff --git a/media/libstagefright/codecs/amrwbenc/Android.mk b/media/libstagefright/codecs/amrwbenc/Android.mk
index 77a7b1e..026006e 100644
--- a/media/libstagefright/codecs/amrwbenc/Android.mk
+++ b/media/libstagefright/codecs/amrwbenc/Android.mk
@@ -80,7 +80,8 @@
         src/asm/ARMV7/Syn_filt_32_neon.s \
         src/asm/ARMV7/syn_filt_neon.s
 
-    LOCAL_CFLAGS_arm := -DARM -DARMV7 -DASM_OPT
+    # don't actually generate neon instructions, see bug 26932980
+    LOCAL_CFLAGS_arm := -DARM -DARMV7 -DASM_OPT -mfpu=vfpv3
     LOCAL_C_INCLUDES_arm := $(LOCAL_PATH)/src/asm/ARMV5E
     LOCAL_C_INCLUDES_arm += $(LOCAL_PATH)/src/asm/ARMV7
 endif
@@ -102,7 +103,7 @@
 
 LOCAL_CFLAGS += -Werror
 LOCAL_CLANG := true
-LOCAL_SANITIZE := signed-integer-overflow
+#LOCAL_SANITIZE := signed-integer-overflow
 
 include $(BUILD_STATIC_LIBRARY)