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

Commit dff843f2 authored by Bernhard Rosenkraenzer's avatar Bernhard Rosenkraenzer
Browse files

Add missing #includes 



Some header files in stagefright try to use DISALLOW_EVIL_CONSTRUCTORS
(and even DISALLOW_IMPLICIT_CONSTRUCTORS, which isn't defined anywhere
in stagefright) without including the proper header.

With clang, this results in a build failure - with gcc,
it results in DISALLOW_EVIL_CONSTRUCTORS/DISALLOW_IMPLICIT_CONSTRUCTORS
not doing what they were intended to do, instead appearing as a method
in the DWARF debug sections of files using the headers.

Change-Id: Ie4e99affe98ed8fb1bfcf5ec604c19dcd5311c62
Signed-off-by: default avatarBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
parent 6cd6792a

include/media/stagefright/AACWriter.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#ifndef AAC_WRITER_H_

#define AAC_WRITER_H_



#include "foundation/ABase.h"

#include <media/stagefright/MediaWriter.h>

#include <utils/threads.h>

include/media/stagefright/ClockEstimator.h

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


#define CLOCK_ESTIMATOR_H_





#include "foundation/ABase.h"

#include <utils/RefBase.h>

#include <utils/Vector.h>

include/media/stagefright/MediaMuxer.h

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#include <utils/Vector.h>

#include <utils/threads.h>



#include "foundation/ABase.h"



namespace android {



struct ABuffer;

include/media/stagefright/SurfaceMediaSource.h

+3 −1
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 
#include <media/stagefright/MediaSource.h>

#include <media/stagefright/MediaBuffer.h>



#include "foundation/ABase.h"



namespace android {

// ----------------------------------------------------------------------------
@@ -228,7 +230,7 @@ private: 
    Condition mMediaBuffersAvailableCondition;



    // Avoid copying and equating and default constructor

    DISALLOW_IMPLICIT_CONSTRUCTORS(SurfaceMediaSource);

    DISALLOW_EVIL_CONSTRUCTORS(SurfaceMediaSource);

};



// ----------------------------------------------------------------------------