resolved conflicts for 5cfb105b to master (ea56b569) · Commits · e / os / android_frameworks_av

media/libstagefright/rtsp/Android.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ endif

		LOCAL_CFLAGS += -Werror -Wall
		LOCAL_CLANG := true
		LOCAL_SANITIZE := unsigned-integer-overflow
		LOCAL_SANITIZE := unsigned-integer-overflow signed-integer-overflow

		LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

		@@ -58,6 +58,7 @@ LOCAL_C_INCLUDES:= \

		LOCAL_CFLAGS += -Wno-multichar -Werror -Wall
		LOCAL_CLANG := true
		LOCAL_SANITIZE := signed-integer-overflow

		LOCAL_MODULE_TAGS := optional