summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2016-01-05 12:01:26 -0800
committerSteve Kondik <steve@cyngn.com>2016-01-08 21:32:48 -0800
commit94f3841a5218c0e8d5dd19c3f92e38419f808725 (patch)
treee98037747341d6b457cb2fc51459b193f0eb1d4e /media/libstagefright/codecs
parent3fec0e568834dfacb0a10455297c7cddfaeb2f51 (diff)
downloadframeworks_av-94f3841a5218c0e8d5dd19c3f92e38419f808725.zip
frameworks_av-94f3841a5218c0e8d5dd19c3f92e38419f808725.tar.gz
frameworks_av-94f3841a5218c0e8d5dd19c3f92e38419f808725.tar.bz2
Disable integer sanitization for amrwbenc
Integer sanitization causes too many false positives, and so far all have been benign or intentional. Change-Id: I3c40e478e3da31023a635f4ef212873c1fb644f3
Diffstat (limited to 'media/libstagefright/codecs')
-rw-r--r--media/libstagefright/codecs/amrwbenc/Android.mk4
-rw-r--r--media/libstagefright/codecs/amrwbenc/inc/basic_op.h1
2 files changed, 4 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/amrwbenc/Android.mk b/media/libstagefright/codecs/amrwbenc/Android.mk
index 024a292..537c634 100644
--- a/media/libstagefright/codecs/amrwbenc/Android.mk
+++ b/media/libstagefright/codecs/amrwbenc/Android.mk
@@ -116,6 +116,8 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/src/asm/ARMV7
endif
LOCAL_CFLAGS += -Werror
+LOCAL_CLANG := true
+#LOCAL_SANITIZE := signed-integer-overflow
include $(BUILD_STATIC_LIBRARY)
@@ -132,6 +134,8 @@ LOCAL_C_INCLUDES := \
frameworks/native/include/media/openmax
LOCAL_CFLAGS += -Werror
+LOCAL_CLANG := true
+#LOCAL_SANITIZE := signed-integer-overflow
LOCAL_STATIC_LIBRARIES := \
libstagefright_amrwbenc
diff --git a/media/libstagefright/codecs/amrwbenc/inc/basic_op.h b/media/libstagefright/codecs/amrwbenc/inc/basic_op.h
index 87d7ec6..e63a55a 100644
--- a/media/libstagefright/codecs/amrwbenc/inc/basic_op.h
+++ b/media/libstagefright/codecs/amrwbenc/inc/basic_op.h
@@ -607,7 +607,6 @@ static_vo Word32 L_add (Word32 L_var1, Word32 L_var2)
|___________________________________________________________________________|
*/
-__attribute__((no_sanitize("integer")))
static_vo Word32 L_sub (Word32 L_var1, Word32 L_var2)
{
Word32 L_var_out;