commit b41f94219d6a9c93803ea1897b0efba15a50efac
author Dan Austin <danielaustin@google.com> Wed Sep 16 17:33:59 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 16 17:33:59 2015 +0000
tree 3f8093007e155f1f06505b752aad091cc3aa544e
parent 7dbed399cbef000e3131464f9051db6aceffda7e
parent 031af4d5004972331828fdf75e8e1f3fa79d20dd

Merge "resolved conflicts for b6c719ec to stage-aosp-master" into stage-aosp-master

media/libstagefright/matroska/Android.mk

diff --git a/media/libstagefright/matroska/Android.mk b/media/libstagefright/matroska/Android.mk
index ea4f835..1e8c2b2 100644
--- a/media/libstagefright/matroska/Android.mk
+++ b/media/libstagefright/matroska/Android.mk
@@ -10,7 +10,6 @@
 
 LOCAL_CFLAGS += -Wno-multichar -Werror -Wall
 LOCAL_CLANG := true
-LOCAL_SANITIZE := signed-integer-overflow
 
 LOCAL_MODULE:= libstagefright_matroska
 

media/libstagefright/rtsp/Android.mk

diff --git a/media/libstagefright/rtsp/Android.mk b/media/libstagefright/rtsp/Android.mk
index a14ba16..c5e8c35 100644
--- a/media/libstagefright/rtsp/Android.mk
+++ b/media/libstagefright/rtsp/Android.mk
@@ -33,7 +33,6 @@
 
 LOCAL_CFLAGS += -Werror -Wall
 LOCAL_CLANG := true
-LOCAL_SANITIZE := signed-integer-overflow
 
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
@@ -56,14 +55,8 @@
 	frameworks/av/media/libstagefright \
 	$(TOP)/frameworks/native/include/media/openmax
 
-<<<<<<< HEAD
 LOCAL_CFLAGS += -Wno-multichar -Werror -Wall
 LOCAL_CLANG := true
-=======
-LOCAL_CFLAGS += -Wno-multichar
-LOCAL_CLANG := true
-LOCAL_SANITIZE := signed-integer-overflow
->>>>>>> c82fcdda59031a3886863be2622994819d80ba25
 
 LOCAL_MODULE_TAGS := optional