Merge "resolved conflicts for c82fcdda to stage-aosp-master" into stage-aosp-master (9d46697e) · Commits · e / os / android_frameworks_av

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