summaryrefslogtreecommitdiff
path: root/src/gallium/targets/Android.mk
diff options
context:
space:
mode:
Diffstat (limited to 'src/gallium/targets/Android.mk')
-rw-r--r--src/gallium/targets/Android.mk17
1 files changed, 13 insertions, 4 deletions
diff --git a/src/gallium/targets/Android.mk b/src/gallium/targets/Android.mk
index 55cd354..ea35abf 100644
--- a/src/gallium/targets/Android.mk
+++ b/src/gallium/targets/Android.mk
@@ -66,11 +66,9 @@ LOCAL_SHARED_LIBRARIES += \
libdrm_intel
endif # MESA_BUILD_I915G
-ifeq ($(strip $(MESA_BUILD_R600G)),true)
-LOCAL_CFLAGS += -D_EGL_PIPE_R600 -D_EGL_PIPE_R300
+ifeq ($(strip $(MESA_BUILD_R300)),true)
+LOCAL_CFLAGS += -D_EGL_PIPE_R300
LOCAL_STATIC_LIBRARIES := \
- libmesa_pipe_r600 \
- libmesa_winsys_r600 \
libmesa_pipe_r300 \
libmesa_winsys_r300 \
libr300_dri \
@@ -78,6 +76,17 @@ LOCAL_STATIC_LIBRARIES := \
LOCAL_SHARED_LIBRARIES += \
libdrm \
libdrm_radeon
+endif # MESA_BUILD_R300
+
+ifeq ($(strip $(MESA_BUILD_R600G)),true)
+LOCAL_CFLAGS += -D_EGL_PIPE_R600
+LOCAL_STATIC_LIBRARIES := \
+ libmesa_pipe_r600 \
+ libmesa_winsys_r600 \
+ $(LOCAL_STATIC_LIBRARIES)
+LOCAL_SHARED_LIBRARIES += \
+ libdrm \
+ libdrm_radeon
endif # MESA_BUILD_R600G
LOCAL_MODULE := libGLES_mesa