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

Commit 164ee879 authored by Dan Austin's avatar Dan Austin
Browse files

resolved conflicts for c41a35e8 to master 

Change-Id: I074fa628d85716fc31041f8b88b9d82b8ced00f3
parents d09f3e3f c41a35e8

media/libstagefright/matroska/Android.mk

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


LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_CLANG := true

LOCAL_SANITIZE := unsigned-integer-overflow

LOCAL_SANITIZE := unsigned-integer-overflow signed-integer-overflow



LOCAL_MODULE:= libstagefright_matroska