QCOM: tile renderer: ifdef with QCOM_HARDWARE

Change-Id: I6235dfb6c28d99782b1b827e15af2e61173e2144

6 files changed, 24 insertions, 3 deletions

diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index 8592302..2489f99 100755
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -162,7 +162,6 @@ LOCAL_C_INCLUDES += \
 	$(LOCAL_PATH)/android/graphics \
 	$(LOCAL_PATH)/../../libs/hwui \
 	$(LOCAL_PATH)/../../opengl/libs \
-	hardware/qcom/display/libtilerenderer \
 	$(call include-path-for, bluedroid) \
 	$(call include-path-for, libhardware)/hardware \
 	$(call include-path-for, libhardware_legacy)/hardware_legacy \
@@ -220,7 +219,13 @@ LOCAL_SHARED_LIBRARIES := \
 	libz \
 
 ifeq ($(USE_OPENGL_RENDERER),true)
-	LOCAL_SHARED_LIBRARIES += libhwui libtilerenderer
+	LOCAL_SHARED_LIBRARIES += libhwui
+endif
+
+ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
+LOCAL_C_INCLUDES += hardware/qcom/display/libtilerenderer
+LOCAL_SHARED_LIBRARIES += libtilerenderer
+LOCAL_CFLAGS += -DQCOM_HARDWARE
 endif
 
 ifeq ($(BOARD_HAVE_BLUETOOTH),true)
diff --git a/core/jni/android_view_GLES20Canvas.cpp b/core/jni/android_view_GLES20Canvas.cpp
index a0e1c50..50affd1 100644
--- a/core/jni/android_view_GLES20Canvas.cpp
+++ b/core/jni/android_view_GLES20Canvas.cpp
@@ -43,7 +43,10 @@
 #include <SkiaShader.h>
 #include <SkiaColorFilter.h>
 #include <Rect.h>
+
+#ifdef QCOM_HARDWARE
 #include <tilerenderer.h>
+#endif
 
 #include <TextLayout.h>
 
@@ -177,6 +180,7 @@ static void android_view_GLES20Canvas_prepare(JNIEnv* env, jobject clazz,
     renderer->prepare(opaque);
 }
 
+#ifdef QCOM_HARDWARE
 static void android_view_GLES20Canvas_startTileRendering(JNIEnv* env, jobject clazz,
         OpenGLRenderer* renderer, jint left, jint top, jint right, jint bottom) {
     TileRenderer::getInstance().startTileRendering(renderer, left, top, right, bottom);
@@ -186,6 +190,7 @@ static void android_view_GLES20Canvas_endTileRendering(JNIEnv* env, jobject claz
         OpenGLRenderer* renderer) {
     TileRenderer::getInstance().endTileRendering(renderer);
 }
+#endif
 
 static void android_view_GLES20Canvas_prepareDirty(JNIEnv* env, jobject clazz,
         OpenGLRenderer* renderer, jint left, jint top, jint right, jint bottom,
@@ -796,8 +801,10 @@ static JNINativeMethod gMethods[] = {
     { "nSetViewport",       "(III)V",          (void*) android_view_GLES20Canvas_setViewport },
     { "nPrepare",           "(IZ)V",           (void*) android_view_GLES20Canvas_prepare },
     { "nPrepareDirty",      "(IIIIIZ)V",       (void*) android_view_GLES20Canvas_prepareDirty },
+#ifdef QCOM_HARDWARE
     { "nStartTileRendering","(IIIII)V",        (void*) android_view_GLES20Canvas_startTileRendering},
     { "nEndTileRendering",  "(I)V",            (void*) android_view_GLES20Canvas_endTileRendering},
+#endif
     { "nFinish",            "(I)V",            (void*) android_view_GLES20Canvas_finish },
 
     { "nCallDrawGLFunction", "(II)Z",
diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk
index 9bfc94c..1d9f1f9 100644
--- a/libs/hwui/Android.mk
+++ b/libs/hwui/Android.mk
@@ -42,6 +42,10 @@ ifeq ($(USE_OPENGL_RENDERER),true)
 	LOCAL_CFLAGS += -fvisibility=hidden
 	LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 	LOCAL_SHARED_LIBRARIES := libcutils libutils libGLESv2 libskia libui
+
+ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
+LOCAL_CFLAGS += -DQCOM_HARDWARE
+endif
 	LOCAL_MODULE := libhwui
 	LOCAL_MODULE_TAGS := optional
 	
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index 5ebbdaf..d8f0815 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -144,10 +144,12 @@ void OpenGLRenderer::setViewport(int width, int height) {
     mDirtyClip = false;
 }
 
+#ifdef QCOM_HARDWARE
 void OpenGLRenderer::getViewport(int &width, int &height) {
     width = mWidth;
     height = mHeight;
 }
+#endif
 
 void OpenGLRenderer::prepare(bool opaque) {
     prepareDirty(0.0f, 0.0f, mWidth, mHeight, opaque);
diff --git a/libs/hwui/OpenGLRenderer.h b/libs/hwui/OpenGLRenderer.h
index 150511f..40dd5b3 100644
--- a/libs/hwui/OpenGLRenderer.h
+++ b/libs/hwui/OpenGLRenderer.h
@@ -63,8 +63,9 @@ public:
     virtual ~OpenGLRenderer();
 
     virtual void setViewport(int width, int height);
+#ifdef QCOM_HARDWARE
     ANDROID_API void getViewport(int &width, int &height);
-
+#endif
     ANDROID_API void prepare(bool opaque);
     virtual void prepareDirty(float left, float top, float right, float bottom, bool opaque);
     virtual void finish();
diff --git a/opengl/include/GLES2/gl2ext.h b/opengl/include/GLES2/gl2ext.h
index 22a317a..82befc2 100644
--- a/opengl/include/GLES2/gl2ext.h
+++ b/opengl/include/GLES2/gl2ext.h
@@ -16,7 +16,9 @@ extern "C" {
 #   define GL_APIENTRYP GL_APIENTRY*
 #endif
 
+#ifdef QCOM_HARDWARE
 #define GL_GLEXT_PROTOTYPES
+#endif
 
 /*------------------------------------------------------------------------*
  * OES extension tokens