Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dbed399 authored by Dan Austin's avatar Dan Austin Committed by Android (Google) Code Review
Browse files

Merge "Revert "resolved conflicts for c82fcdda to stage-aosp-master"" into stage-aosp-master

parents 9d46697e 33cb1ec2

media/libstagefright/matroska/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ LOCAL_C_INCLUDES:= \ 


LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_CLANG := true

LOCAL_SANITIZE := signed-integer-overflow



LOCAL_MODULE:= libstagefright_matroska

media/libstagefright/rtsp/Android.mk

+0 −7
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ endif 


LOCAL_CFLAGS += -Werror -Wall

LOCAL_CLANG := true

LOCAL_SANITIZE := signed-integer-overflow



LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
@@ -56,14 +55,8 @@ LOCAL_C_INCLUDES:= \ 
	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