commit 2b1ec058eb50844fec9ef1ecd690778b6dac4309
author Dan Austin <danielaustin@google.com> Wed Sep 16 17:55:13 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 16 17:55:13 2015 +0000
tree f08e48eb63af507c8188c6470ce6f1f41622d406
parent ffa5ac80d22add04b1f35e129be6f2d53129ff96
parent b14ccf228cab22e471ad400445210e6fe807cf20

am b14ccf22: am b41f9421: Merge "resolved conflicts for b6c719ec to stage-aosp-master" into stage-aosp-master

* commit 'b14ccf228cab22e471ad400445210e6fe807cf20':
  Enable signed-integer-overflow in timedtext

media/libstagefright/timedtext/Android.mk

diff --git a/media/libstagefright/timedtext/Android.mk b/media/libstagefright/timedtext/Android.mk
index 58fb12f..4d4ffba 100644
--- a/media/libstagefright/timedtext/Android.mk
+++ b/media/libstagefright/timedtext/Android.mk
@@ -11,6 +11,7 @@
 
 LOCAL_CFLAGS += -Wno-multichar -Werror -Wall
 LOCAL_CLANG := true
+LOCAL_SANITIZE := signed-integer-overflow
 
 LOCAL_C_INCLUDES:= \
         $(TOP)/frameworks/av/include/media/stagefright/timedtext \