commit bca41e308fc322e27a839448f5eae3337f66b8b7
author Eino-Ville Talvala <etalvala@google.com> Wed Nov 18 01:29:29 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 18 01:29:29 2015 +0000
tree 02ff9a45d0cfe186f64354fc74d87c4e3ec04bed
parent 34a2040fc9276c4a9d9adec94845d75584b3b620
parent d5ae360e883215b7862b1f8d318fe469940fe146

Merge "Revert "Enable fsanitize unsigned-integer-overflow in soft MP3 decoder.""

media/libstagefright/codecs/mp3dec/Android.mk

diff --git a/media/libstagefright/codecs/mp3dec/Android.mk b/media/libstagefright/codecs/mp3dec/Android.mk
index 8faeede..38618da 100644
--- a/media/libstagefright/codecs/mp3dec/Android.mk
+++ b/media/libstagefright/codecs/mp3dec/Android.mk
@@ -52,7 +52,7 @@
 
 LOCAL_CFLAGS += -Werror
 LOCAL_CLANG := true
-LOCAL_SANITIZE := signed-integer-overflow unsigned-integer-overflow
+LOCAL_SANITIZE := signed-integer-overflow
 
 LOCAL_MODULE := libstagefright_mp3dec
 
@@ -75,7 +75,7 @@
 
 LOCAL_CFLAGS += -Werror
 LOCAL_CLANG := true
-LOCAL_SANITIZE := signed-integer-overflow unsigned-integer-overflow
+LOCAL_SANITIZE := signed-integer-overflow
 
 LOCAL_SHARED_LIBRARIES := \
         libstagefright libstagefright_omx libstagefright_foundation libutils liblog
@@ -101,7 +101,7 @@
         $(call include-path-for, audio-utils)
 
 LOCAL_CLANG := true
-LOCAL_SANITIZE := signed-integer-overflow unsigned-integer-overflow
+LOCAL_SANITIZE := signed-integer-overflow
 LOCAL_STATIC_LIBRARIES := \
         libstagefright_mp3dec libsndfile