diff options
| author | Jason Sams <rjsams@android.com> | 2012-02-17 12:04:20 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-17 12:04:20 -0800 |
| commit | e158f203d2290aec1cb9040aee9d9fa2e95042b7 (patch) | |
| tree | 61db8a9f8655cd1020d501ba3754ce500f69a7e1 /libs/rs | |
| parent | c35761e15cfffe2253cef1b1a53dc25d5ca0c353 (diff) | |
| parent | 1d6983af336b2b1d3a24aece58ce0850aa79e8a0 (diff) | |
| download | frameworks_base-e158f203d2290aec1cb9040aee9d9fa2e95042b7.zip frameworks_base-e158f203d2290aec1cb9040aee9d9fa2e95042b7.tar.gz frameworks_base-e158f203d2290aec1cb9040aee9d9fa2e95042b7.tar.bz2 | |
Merge "Rename three header files to free namespace for api."
Diffstat (limited to 'libs/rs')
| -rw-r--r-- | libs/rs/rs.h (renamed from libs/rs/RenderScript.h) | 2 | ||||
| -rw-r--r-- | libs/rs/rsDefines.h (renamed from libs/rs/RenderScriptDefines.h) | 0 | ||||
| -rw-r--r-- | libs/rs/rsEnv.h (renamed from libs/rs/RenderScriptEnv.h) | 0 | ||||
| -rw-r--r-- | libs/rs/rsFileA3D.h | 2 | ||||
| -rw-r--r-- | libs/rs/rsFont.h | 2 | ||||
| -rw-r--r-- | libs/rs/rsMesh.h | 2 | ||||
| -rw-r--r-- | libs/rs/rsPath.h | 2 | ||||
| -rw-r--r-- | libs/rs/rsSampler.h | 2 | ||||
| -rw-r--r-- | libs/rs/rsScriptC.h | 2 | ||||
| -rw-r--r-- | libs/rs/rsUtils.h | 2 | ||||
| -rw-r--r-- | libs/rs/rs_hal.h | 2 |
11 files changed, 9 insertions, 9 deletions
diff --git a/libs/rs/RenderScript.h b/libs/rs/rs.h index 6d54268..fbcaf4a 100644 --- a/libs/rs/RenderScript.h +++ b/libs/rs/rs.h @@ -24,7 +24,7 @@ extern "C" { #endif -#include "RenderScriptDefines.h" +#include "rsDefines.h" // // A3D loading and object update code. diff --git a/libs/rs/RenderScriptDefines.h b/libs/rs/rsDefines.h index 990ef26..990ef26 100644 --- a/libs/rs/RenderScriptDefines.h +++ b/libs/rs/rsDefines.h diff --git a/libs/rs/RenderScriptEnv.h b/libs/rs/rsEnv.h index b82eaf1..b82eaf1 100644 --- a/libs/rs/RenderScriptEnv.h +++ b/libs/rs/rsEnv.h diff --git a/libs/rs/rsFileA3D.h b/libs/rs/rsFileA3D.h index 056b5af..b0d7509 100644 --- a/libs/rs/rsFileA3D.h +++ b/libs/rs/rsFileA3D.h @@ -17,7 +17,7 @@ #ifndef ANDROID_RS_FILE_A3D_H #define ANDROID_RS_FILE_A3D_H -#include "RenderScript.h" +#include "rs.h" #include "rsMesh.h" #include <utils/String8.h> diff --git a/libs/rs/rsFont.h b/libs/rs/rsFont.h index 4ca794d..88c4795 100644 --- a/libs/rs/rsFont.h +++ b/libs/rs/rsFont.h @@ -17,7 +17,7 @@ #ifndef ANDROID_RS_FONT_H #define ANDROID_RS_FONT_H -#include "RenderScript.h" +#include "rs.h" #include "rsStream.h" #include <utils/String8.h> #include <utils/Vector.h> diff --git a/libs/rs/rsMesh.h b/libs/rs/rsMesh.h index 166b5d3..8eea427 100644 --- a/libs/rs/rsMesh.h +++ b/libs/rs/rsMesh.h @@ -18,7 +18,7 @@ #define ANDROID_RS_MESH_H -#include "RenderScript.h" +#include "rs.h" // --------------------------------------------------------------------------- namespace android { diff --git a/libs/rs/rsPath.h b/libs/rs/rsPath.h index dac795e..7c05503 100644 --- a/libs/rs/rsPath.h +++ b/libs/rs/rsPath.h @@ -18,7 +18,7 @@ #define ANDROID_RS_PATH_H -#include "RenderScript.h" +#include "rs.h" // --------------------------------------------------------------------------- namespace android { diff --git a/libs/rs/rsSampler.h b/libs/rs/rsSampler.h index 654cd9c..013e4ca 100644 --- a/libs/rs/rsSampler.h +++ b/libs/rs/rsSampler.h @@ -18,7 +18,7 @@ #define ANDROID_RS_SAMPLER_H #include "rsAllocation.h" -#include "RenderScript.h" +#include "rs.h" // --------------------------------------------------------------------------- namespace android { diff --git a/libs/rs/rsScriptC.h b/libs/rs/rsScriptC.h index c65a5bf..fc4df51 100644 --- a/libs/rs/rsScriptC.h +++ b/libs/rs/rsScriptC.h @@ -19,7 +19,7 @@ #include "rsScript.h" -#include "RenderScriptEnv.h" +#include "rsEnv.h" #ifndef ANDROID_RS_SERIALIZE #include "bcinfo/BitcodeTranslator.h" diff --git a/libs/rs/rsUtils.h b/libs/rs/rsUtils.h index db6f592..a9a992a 100644 --- a/libs/rs/rsUtils.h +++ b/libs/rs/rsUtils.h @@ -34,7 +34,7 @@ #include <math.h> -#include "RenderScript.h" +#include "rs.h" namespace android { namespace renderscript { diff --git a/libs/rs/rs_hal.h b/libs/rs/rs_hal.h index 1201128..e4bf17f 100644 --- a/libs/rs/rs_hal.h +++ b/libs/rs/rs_hal.h @@ -17,7 +17,7 @@ #ifndef RS_HAL_H #define RS_HAL_H -#include <RenderScriptDefines.h> +#include <rsDefines.h> struct ANativeWindow; |