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

Commit 4889c07b authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "frameworks/av: libexpat now exports its includes."

parents f54bd640 242b400f

media/libmedia/MediaProfiles.cpp

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

#include <utils/Log.h>

#include <utils/Vector.h>

#include <utils/Vector.h>

#include <cutils/properties.h>

#include <cutils/properties.h>

#include <libexpat/expat.h>

#include <expat.h>

#include <media/MediaProfiles.h>

#include <media/MediaProfiles.h>

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

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

#include <OMX_Video.h>

#include <OMX_Video.h>

media/libstagefright/MediaCodecList.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ 




#include <utils/threads.h>

#include <utils/threads.h>





#include <libexpat/expat.h>

#include <expat.h>





namespace android {

namespace android {