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

Commit 65e8ca7a authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Gerrit Code Review
Browse files

Merge "Match new paths and organization in external/libvpx"

parents 16ffd2e3 e81a9610

media/libstagefright/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ LOCAL_STATIC_LIBRARIES := \ 
        libstagefright_matroska \

        libstagefright_timedtext \

        libvpx \

        libwebm \

        libstagefright_mpeg2ts \

        libstagefright_httplive \

        libstagefright_id3 \

media/libstagefright/codecs/on2/dec/Android.mk

+3 −4
Original line number Diff line number Diff line
@@ -5,9 +5,9 @@ LOCAL_SRC_FILES := \ 
        SoftVPX.cpp



LOCAL_C_INCLUDES := \

        $(TOP)/external/libvpx \

        $(TOP)/external/libvpx/vpx_codec \

        $(TOP)/external/libvpx/vpx_ports \

        $(TOP)/external/libvpx/libvpx \

        $(TOP)/external/libvpx/libvpx/vpx_codec \

        $(TOP)/external/libvpx/libvpx/vpx_ports \

        frameworks/av/media/libstagefright/include \

        frameworks/native/include/media/openmax \
@@ -21,4 +21,3 @@ LOCAL_MODULE := libstagefright_soft_vpxdec 
LOCAL_MODULE_TAGS := optional



include $(BUILD_SHARED_LIBRARY)

media/libstagefright/matroska/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ LOCAL_SRC_FILES:= \ 
        MatroskaExtractor.cpp



LOCAL_C_INCLUDES:= \

        $(TOP)/external/libvpx/mkvparser \

        $(TOP)/external/libvpx/libwebm \

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



LOCAL_CFLAGS += -Wno-multichar