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

Commit e8057dd8 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Fix libmedia and libstagefright to get expat header files from the approved location. 

Found during a libexpat upgrade.

Change-Id: I9e5abd502a884975d898486edde374fb2519164e
parent 8b152566

media/libmedia/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ LOCAL_C_INCLUDES := \ 
    $(call include-path-for, graphics corecg) \

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

    external/icu4c/common \

    external/expat/lib \

    $(call include-path-for, audio-effects) \

    $(call include-path-for, audio-utils)

media/libmedia/MediaProfiles.cpp

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <utils/Log.h>

#include <utils/Vector.h>

#include <cutils/properties.h>

#include <expat.h>

#include <libexpat/expat.h>

#include <media/MediaProfiles.h>

#include <media/stagefright/foundation/ADebug.h>

#include <OMX_Video.h>

media/libstagefright/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ LOCAL_C_INCLUDES:= \ 
        $(TOP)/frameworks/av/include/media/stagefright/timedtext \

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

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

        $(TOP)/external/expat/lib \

        $(TOP)/external/flac/include \

        $(TOP)/external/tremolo \

        $(TOP)/external/openssl/include \

media/libstagefright/MediaCodecList.cpp

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <media/stagefright/OMXCodec.h>

#include <utils/threads.h>



#include <expat.h>

#include <libexpat/expat.h>



namespace android {