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

Commit fb112452 authored by Dan Albert's avatar Dan Albert Committed by Android (Google) Code Review
Browse files

Merge "Clean up makefile to fix build."

parents f4ead804 b805b31a

cmds/stagefright/Android.mk

+10 −6
Original line number Diff line number Diff line
@@ -169,8 +169,6 @@ include $(BUILD_EXECUTABLE) 


include $(CLEAR_VARS)



LOCAL_NDK_STL_VARIANT := stlport_static



LOCAL_SRC_FILES:= \

	filters/argbtorgba.rs \

	filters/nightvision.rs \
@@ -178,12 +176,18 @@ LOCAL_SRC_FILES:= \ 
	mediafilter.cpp \



LOCAL_SHARED_LIBRARIES := \

	libstagefright liblog libutils libbinder libstagefright_foundation \

	libmedia libgui libcutils libui

	libstagefright \

	liblog \

	libutils \

	libbinder \

	libstagefright_foundation \

	libmedia \

	libgui \

	libcutils \

	libui \

	libRScpp \



LOCAL_C_INCLUDES:= \

	$(TOP)/bionic \

	$(TOP)/external/stlport/stlport \

	$(TOP)/frameworks/av/media/libstagefright \

	$(TOP)/frameworks/native/include/media/openmax \

	$(TOP)/frameworks/rs/cpp \