resolved conflicts for merge of 281b884c to master (11cbb06b) · Commits · e / os / android_frameworks_av

media/libstagefright/rtsp/Android.mk

+7 −0

Original line number	Diff line number	Diff line
		@@ -26,12 +26,17 @@ LOCAL_C_INCLUDES:= \

		LOCAL_MODULE:= libstagefright_rtsp

		LOCAL_WHOLE_STATIC_LIBRARIES := \
		libcrypto_static

		ifeq ($(TARGET_ARCH),arm)
		LOCAL_CFLAGS += -Wno-psabi
		endif

		LOCAL_CFLAGS += -Werror

		LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

		include $(BUILD_STATIC_LIBRARY)

		################################################################################
		@@ -57,4 +62,6 @@ LOCAL_MODULE_TAGS := optional

		LOCAL_MODULE:= rtp_test

		LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

		# include $(BUILD_EXECUTABLE)