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

Commit bd4e0384 authored by Dan Austin's avatar Dan Austin
Browse files

resolved conflicts for c82fcdda to stage-aosp-master 

Change-Id: Icd3053becb307835f925d14bf7d1db91c3652562
parents 0bd64076 c82fcdda

media/libstagefright/matroska/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 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

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


LOCAL_CFLAGS += -Werror -Wall

LOCAL_CLANG := true

LOCAL_SANITIZE := signed-integer-overflow



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