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

Commit 6df8876f authored by Alex Sakhartchouk's avatar Alex Sakhartchouk Committed by Android (Google) Code Review
Browse files

Merge "More header untangling."

parents 6c868398 bedc0231

libs/rs/driver/rsdGL.cpp

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 


#include <malloc.h>

#include "rsContext.h"

#include "rsDevice.h"

#include "rsdShaderCache.h"

#include "rsdVertexArray.h"

#include "rsdFrameBufferObj.h"

libs/rs/rs.h

+0 −8
Original line number Diff line number Diff line
@@ -20,10 +20,6 @@ 
#include <stdint.h>

#include <sys/types.h>



#ifdef __cplusplus

extern "C" {

#endif



#include "rsDefines.h"



//
@@ -61,10 +57,6 @@ RsContext rsContextCreateGL(RsDevice dev, uint32_t version, uint32_t sdkVersion, 


#include "rsgApiFuncDecl.h"



#ifdef __cplusplus

};

#endif



#endif // RENDER_SCRIPT_H

libs/rs/rsAdapter.cpp

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
 */



#include "rsContext.h"

#include "rsAdapter.h"



using namespace android;

using namespace android::renderscript;

libs/rs/rsAllocation.cpp

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
 */



#include "rsContext.h"

#include "rsAllocation.h"

#include "rsAdapter.h"

#include "rs_hal.h"



#include "system/window.h"

libs/rs/rsAnimation.h

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


#include "rsUtils.h"

#include "rsObjectBase.h"



#include "rsDefines.h"

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

namespace android {

namespace renderscript {