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

Commit 18667387 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "MediaCodec refactoring part 2-b: introduce BufferChannel""

parents 4efe5dcb fad01bc4
Loading
Loading
Loading
Loading
+23 −0
Original line number Diff line number Diff line
@@ -124,6 +124,29 @@ include $(BUILD_EXECUTABLE)

include $(CLEAR_VARS)

LOCAL_SRC_FILES:=         \
	sf2.cpp    \

LOCAL_SHARED_LIBRARIES := \
	libstagefright liblog libutils libbinder libstagefright_foundation \
	libmedia libgui libcutils

LOCAL_C_INCLUDES:= \
	frameworks/av/media/libstagefright \
	$(TOP)/frameworks/native/include/media/openmax

LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE:= sf2

include $(BUILD_EXECUTABLE)

################################################################################

include $(CLEAR_VARS)

LOCAL_SRC_FILES:=               \
	codec.cpp               \
	SimplePlayer.cpp        \
+788 −0

File added.

Preview size limit exceeded, changes collapsed.

+21 −4

File changed.

Preview size limit exceeded, changes collapsed.

+55 −132

File changed.

Preview size limit exceeded, changes collapsed.

+8 −9

File changed.

Preview size limit exceeded, changes collapsed.

Loading