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

Commit a20fc62f authored by Johann's avatar Johann
Browse files

Match new paths and organization in external/libvpx 

See I2c0a87b0fc049e855e21f455b806287b578091de

Change-Id: Iec8566bce0a4763a9a17b4a46f15aa39b5bcd141
parent 03425d9c

media/libstagefright/Android.mk

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

        libstagefright_matroska \

        libstagefright_timedtext \

        libstagefright_timedtext \

        libvpx \

        libvpx \

        libwebm \

        libstagefright_mpeg2ts \

        libstagefright_mpeg2ts \

        libstagefright_httplive \

        libstagefright_httplive \

        libstagefright_id3 \

        libstagefright_id3 \

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

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

        SoftVPX.cpp





LOCAL_C_INCLUDES := \

LOCAL_C_INCLUDES := \

        $(TOP)/external/libvpx \

        $(TOP)/external/libvpx/libvpx \

        $(TOP)/external/libvpx/vpx_codec \

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

        $(TOP)/external/libvpx/vpx_ports \

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

        frameworks/av/media/libstagefright/include \

        frameworks/av/media/libstagefright/include \

        frameworks/native/include/media/openmax \

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

LOCAL_MODULE_TAGS := optional





include $(BUILD_SHARED_LIBRARY)
 
include $(BUILD_SHARED_LIBRARY)

media/libstagefright/matroska/Android.mk

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

        MatroskaExtractor.cpp





LOCAL_C_INCLUDES:= \

LOCAL_C_INCLUDES:= \

        $(TOP)/external/libvpx/mkvparser \

        $(TOP)/external/libvpx/libwebm \

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

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





LOCAL_CFLAGS += -Wno-multichar

LOCAL_CFLAGS += -Wno-multichar