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

Commit b805b31a authored by Dan Albert's avatar Dan Albert
Browse files

Clean up makefile to fix build. 

mediafilter was defining LOCAL_NDK_STL_VARIANT, but never setting
LOCAL_SDK_VERSION, so it was a no-op. Since the project was still
manually setting the stlport include path, it was getting the stlport
headers with precedence over libc++, which breaks the world.

Once that is fixed, the project has never linked libRScpp, which is
required (I'm not sure how this part has ever worked).

Change-Id: Iac70c86bc150eea08329812c0d5744434318d28e
parent 9014f590

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 \