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

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

Merge "Starting to untangle header spaghetti."

parents c9a39081 137ccbb8

libs/rs/RenderScript.cpp

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <string.h>



#include "RenderScript.h"

#include "rs.h"



bool RenderScript::gInitialized = false;

pthread_mutex_t RenderScript::gInitMutex = PTHREAD_MUTEX_INITIALIZER;

libs/rs/RenderScript.h

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

#include <utils/Vector.h>



#include "rs.h"

#include "rsDefines.h"



class Element;

class Type;

libs/rs/rsComponent.h

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#define ANDROID_COMPONENT_H



#include "rsUtils.h"

#include "rsDefines.h"



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

namespace android {

libs/rs/rsContext.cpp

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 * limitations under the License.

 */



#include "rs.h"

#include "rsDevice.h"

#include "rsContext.h"

#include "rsThreadIO.h"

libs/rs/rsElement.h

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


#include "rsComponent.h"

#include "rsUtils.h"

#include "rsDefines.h"

#include "rsObjectBase.h"



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