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

Commit e158f203 authored by Jason Sams's avatar Jason Sams Committed by Android (Google) Code Review
Browse files

Merge "Rename three header files to free namespace for api."

parents c35761e1 1d6983af

graphics/jni/android_renderscript_RenderScript.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -41,8 +41,8 @@ 
#include "android_runtime/android_view_Surface.h"

#include "android_runtime/android_view_Surface.h"

#include "android_runtime/android_util_AssetManager.h"

#include "android_runtime/android_util_AssetManager.h"





#include <RenderScript.h>

#include <rs.h>

#include <RenderScriptEnv.h>

#include <rsEnv.h>

#include <gui/SurfaceTexture.h>

#include <gui/SurfaceTexture.h>

#include <gui/SurfaceTextureClient.h>

#include <gui/SurfaceTextureClient.h>

#include <android_runtime/android_graphics_SurfaceTexture.h>

#include <android_runtime/android_graphics_SurfaceTexture.h>

libs/rs/RenderScript.h→libs/rs/rs.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ 
extern "C" {

extern "C" {

#endif

#endif





#include "RenderScriptDefines.h"

#include "rsDefines.h"





//

//

// A3D loading and object update code.

// A3D loading and object update code.

libs/rs/RenderScriptDefines.h→libs/rs/rsDefines.h

+0 −0

File moved.

View file

libs/rs/RenderScriptEnv.h→libs/rs/rsEnv.h

+0 −0

File moved.

View file

libs/rs/rsFileA3D.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ 
#ifndef ANDROID_RS_FILE_A3D_H

#ifndef ANDROID_RS_FILE_A3D_H

#define ANDROID_RS_FILE_A3D_H

#define ANDROID_RS_FILE_A3D_H





#include "RenderScript.h"

#include "rs.h"

#include "rsMesh.h"

#include "rsMesh.h"





#include <utils/String8.h>

#include <utils/String8.h>