commit d0f5bd130bdbd5b357b7f1db4562fa55e06d384c
author Alex Sakhartchouk <alexst@google.com> Mon Jan 31 14:53:24 2011 -0800
committer Alex Sakhartchouk <alexst@google.com> Mon Jan 31 14:53:24 2011 -0800
tree 48ee3f26d8879c2a92b8ee60df9821d46666e9e2
parent e62e890b68cce46b4ed19010874707d3d45fa258

Cleaning up the serialization change.
Renaming the define to be more in line with what it does and removing the host stub header file.

Change-Id: Ibd3a0a6a398c7f81cc661f71e4478707fe1679ed

libs/rs/rsComponent.cpp

diff --git a/libs/rs/rsComponent.cpp b/libs/rs/rsComponent.cpp
index cb3caf8..4c4987a 100644
--- a/libs/rs/rsComponent.cpp
+++ b/libs/rs/rsComponent.cpp
@@ -16,7 +16,7 @@
 
 #include "rsComponent.h"
 
-#ifndef ANDROID_RS_BUILD_FOR_HOST
+#ifndef ANDROID_RS_SERIALIZE
 #include <GLES/gl.h>
 #endif
 
@@ -181,7 +181,7 @@
 }
 
 uint32_t Component::getGLType() const {
-#ifndef ANDROID_RS_BUILD_FOR_HOST
+#ifndef ANDROID_RS_SERIALIZE
     switch (mType) {
     case RS_TYPE_UNSIGNED_5_6_5:    return GL_UNSIGNED_SHORT_5_6_5;
     case RS_TYPE_UNSIGNED_5_5_5_1:  return GL_UNSIGNED_SHORT_5_5_5_1;
@@ -195,12 +195,12 @@
     case RS_TYPE_SIGNED_16:     return GL_SHORT;
     default:    break;
     }
-#endif //ANDROID_RS_BUILD_FOR_HOST
+#endif //ANDROID_RS_SERIALIZE
     return 0;
 }
 
 uint32_t Component::getGLFormat() const {
-#ifndef ANDROID_RS_BUILD_FOR_HOST
+#ifndef ANDROID_RS_SERIALIZE
     switch (mKind) {
     case RS_KIND_PIXEL_L: return GL_LUMINANCE;
     case RS_KIND_PIXEL_A: return GL_ALPHA;
@@ -209,7 +209,7 @@
     case RS_KIND_PIXEL_RGBA: return GL_RGBA;
     default: break;
     }
-#endif //ANDROID_RS_BUILD_FOR_HOST
+#endif //ANDROID_RS_SERIALIZE
     return 0;
 }