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

Commit 40e1e3bd authored by Dan Austin's avatar Dan Austin
Browse files

resolved conflicts for 3fc9361f to master 

Change-Id: Id2674d4402451f1d0679b77cdea76f5cf324ebed
parents 18749e87 3fc9361f

media/libstagefright/httplive/Android.mk

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


LOCAL_CFLAGS += -Werror -Wall

LOCAL_CLANG := true

LOCAL_SANITIZE := unsigned-integer-overflow

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



LOCAL_SHARED_LIBRARIES := \

        libbinder \