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

Commit fa0fa451 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Express libmedia dependencies in stagefright components"

parents 9a7bca43 e4bbb6a0

media/libstagefright/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -122,6 +122,8 @@ LOCAL_SHARED_LIBRARIES += \ 
        libdl \

        libRScpp \



LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := libmedia



LOCAL_CFLAGS += -Wno-multichar -Werror -Wno-error=deprecated-declarations -Wall



# enable experiments only in userdebug and eng builds

media/libstagefright/filters/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ LOCAL_C_INCLUDES += $(intermediates) 
LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_CLANG := true



LOCAL_SHARED_LIBRARIES := libmedia



LOCAL_MODULE:= libstagefright_mediafilter



include $(BUILD_STATIC_LIBRARY)

media/libstagefright/id3/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ LOCAL_CFLAGS += -Werror -Wall 
LOCAL_CLANG := true

LOCAL_SANITIZE := unsigned-integer-overflow signed-integer-overflow



LOCAL_SHARED_LIBRARIES := libmedia



LOCAL_MODULE := libstagefright_id3



include $(BUILD_STATIC_LIBRARY)

media/libstagefright/matroska/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ LOCAL_C_INCLUDES:= \ 
LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_CLANG := true



LOCAL_SHARED_LIBRARIES := libmedia



LOCAL_MODULE:= libstagefright_matroska



include $(BUILD_STATIC_LIBRARY)

media/libstagefright/mpeg2ts/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ LOCAL_CFLAGS += -Werror -Wall 
LOCAL_CLANG := true

LOCAL_SANITIZE := unsigned-integer-overflow signed-integer-overflow



LOCAL_SHARED_LIBRARIES := libmedia



LOCAL_MODULE:= libstagefright_mpeg2ts



ifeq ($(TARGET_ARCH),arm)