diff options
| author | Jason Sams <jsams@google.com> | 2015-01-21 20:32:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-21 20:32:16 +0000 |
| commit | 39070667cd21952d90e929a9c12f11cb9d4f2ab3 (patch) | |
| tree | 016c49a6d577cdfe83fe317bdf30274a43923199 | |
| parent | c8d7a9313bb9bf980a4f88cf1b4a6437b7b95797 (diff) | |
| parent | 85e51c2337f915cd347ef640763ecc9cfd5ad621 (diff) | |
| download | rs-lollipop-mr1-wfc-release.tar.gz | |
Merge "Fix header API version for MR1" into lmp-mr1-devandroid-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-releaselollipop-mr1-dev
| -rw-r--r-- | scriptc/rs_allocation.rsh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scriptc/rs_allocation.rsh b/scriptc/rs_allocation.rsh index cdf64e89..03bd1ca9 100644 --- a/scriptc/rs_allocation.rsh +++ b/scriptc/rs_allocation.rsh @@ -374,8 +374,7 @@ extern const uchar __attribute__((overloadable)) #endif // (defined(RS_VERSION) && (RS_VERSION >= 18)) -// FIXME: this needs to be set to 22 -#if (defined(RS_VERSION) && (RS_VERSION >= 21)) +#if (defined(RS_VERSION) && (RS_VERSION >= 22)) #define VOP(T) \ extern T __attribute__((overloadable)) \ @@ -424,8 +423,7 @@ VOP(double4) #undef VOP -// FIXME -#endif //(defined(RS_VERSION) && (RS_VERSION >= 21)) +#endif //(defined(RS_VERSION) && (RS_VERSION >= 22)) #endif |