diff options
| author | Jason Sams <rjsams@android.com> | 2010-03-01 15:40:37 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-01 15:40:37 -0800 |
| commit | 053100e6b6fdb57dbea98f7adff48fd07455c00b (patch) | |
| tree | abadf3802c31706df583cbdb30f1a84b178e7681 /libs/rs/RenderScript.h | |
| parent | 8cbb8f5e1f939b03515cb4d5942c3fcb226efb9e (diff) | |
| parent | 7eecbf2085bcfe475daf68090a1a4f47fbb6ec72 (diff) | |
| download | frameworks_base-053100e6b6fdb57dbea98f7adff48fd07455c00b.zip frameworks_base-053100e6b6fdb57dbea98f7adff48fd07455c00b.tar.gz frameworks_base-053100e6b6fdb57dbea98f7adff48fd07455c00b.tar.bz2 | |
Merge "Begin implementation of generated java files from RS files."
Diffstat (limited to 'libs/rs/RenderScript.h')
| -rw-r--r-- | libs/rs/RenderScript.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/rs/RenderScript.h b/libs/rs/RenderScript.h index 02667d8..0c95e7d 100644 --- a/libs/rs/RenderScript.h +++ b/libs/rs/RenderScript.h @@ -200,8 +200,9 @@ enum RsPrimitive { RS_PRIMITIVE_TRIANGLE_FAN }; - +#ifndef NO_RS_FUNCS #include "rsgApiFuncDecl.h" +#endif #ifdef __cplusplus }; |