commit 0b575de8ed0b628d84d256f5846500b0385979bd
author Tim Murray <timmurray@google.com> Fri Mar 15 15:56:43 2013 -0700
committer Tim Murray <timmurray@google.com> Tue Mar 19 15:08:44 2013 -0700
tree 255a20e02100f2c53cfaa05b29fb905b38aa6202
parent 2487bb71ac56dea46ed382739c37f136e67b2062

Add x86 server support.

Change-Id: I674acaf15b67afa48bc736f72942a11e2e38e940

driver/rsdAllocation.h

diff --git a/driver/rsdAllocation.h b/driver/rsdAllocation.h
index d8f46c5..c209203 100644
--- a/driver/rsdAllocation.h
+++ b/driver/rsdAllocation.h
@@ -22,11 +22,13 @@
 #include <rsAllocation.h>
 
 #include "../cpu_ref/rsd_cpu.h"
+
+#ifndef RS_SERVER
 #include "gui/CpuConsumer.h"
 #include "gui/GLConsumer.h"
-
 #include <GLES/gl.h>
 #include <GLES2/gl2.h>
+#endif
 
 class RsdFrameBufferObj;
 struct ANativeWindow;
@@ -65,8 +67,10 @@
     ANativeWindow *wnd;
     ANativeWindowBuffer *wndBuffer;
 
+#ifndef RS_SERVER
     android::sp< android::CpuConsumer > cpuConsumer;
     android::CpuConsumer::LockedBuffer lb;
+#endif
 };
 
 #ifndef RS_COMPATIBILITY_LIB