commit ea56b569bb1082a24382ab5748572918037ffaeb
author Dan Austin <danielaustin@google.com> Wed Sep 16 11:31:12 2015 -0700
committer Dan Austin <danielaustin@google.com> Wed Sep 16 11:31:12 2015 -0700
tree 308bdd1ee5090c2e00d2c6807c34014afaaa7a8f
parent 45409868318b8a273f3fbb395a0c4387840a80e6
parent 5cfb105b839aab28d4b0f4932662a3d5cd33b25d

resolved conflicts for 5cfb105b to master

Change-Id: Ib8db576bfa4a0091b15abcd80ea22348102df47c

media/libstagefright/rtsp/Android.mk

diff --git a/media/libstagefright/rtsp/Android.mk b/media/libstagefright/rtsp/Android.mk
index 8bcb29e..dfb3d9c 100644
--- a/media/libstagefright/rtsp/Android.mk
+++ b/media/libstagefright/rtsp/Android.mk
@@ -33,7 +33,7 @@
 
 LOCAL_CFLAGS += -Werror -Wall
 LOCAL_CLANG := true
-LOCAL_SANITIZE := unsigned-integer-overflow
+LOCAL_SANITIZE := unsigned-integer-overflow signed-integer-overflow
 
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
@@ -58,6 +58,7 @@
 
 LOCAL_CFLAGS += -Wno-multichar -Werror -Wall
 LOCAL_CLANG := true
+LOCAL_SANITIZE := signed-integer-overflow
 
 LOCAL_MODULE_TAGS := optional