4 files changed, 21 insertions, 13 deletions
diff --git a/src/gallium/drivers/r300/Android.mk b/src/gallium/drivers/r300/Android.mk
index acb9a87b83..779ba673a5 100755
--- a/src/gallium/drivers/r300/Android.mk
+++ b/src/gallium/drivers/r300/Android.mk
@@ -1,4 +1,4 @@
-ifeq ($(strip $(MESA_BUILD_R600G)),true)
+ifeq ($(strip $(MESA_BUILD_R300)),true)
 
 LOCAL_PATH := $(call my-dir)
 
@@ -50,4 +50,4 @@ LOCAL_MODULE := libmesa_pipe_r300
 
 include $(BUILD_STATIC_LIBRARY)
 
-endif # MESA_BUILD_R600G
+endif # MESA_BUILD_R300
diff --git a/src/gallium/targets/Android.mk b/src/gallium/targets/Android.mk
index 55cd354a5d..ea35abf4e8 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
diff --git a/src/gallium/winsys/radeon/Android.mk b/src/gallium/winsys/radeon/Android.mk
index 2726ddde8c..6e6d157624 100755
--- a/src/gallium/winsys/radeon/Android.mk
+++ b/src/gallium/winsys/radeon/Android.mk
@@ -1,4 +1,4 @@
-ifeq ($(strip $(MESA_BUILD_R600G)),true)
+ifeq ($(strip $(MESA_BUILD_R300)),true)
 
 LOCAL_PATH := $(call my-dir)
 
@@ -30,4 +30,4 @@ LOCAL_MODULE := libmesa_winsys_r300
 
 include $(BUILD_STATIC_LIBRARY)
 
-endif # MESA_BUILD_R600G
+endif # MESA_BUILD_R300
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
index fa20d7eb98..b582cf44d1 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
@@ -39,6 +39,10 @@
 #include <xf86drm.h>
 #include <errno.h>
 
+#define RADEON_BO_FLAGS_MACRO_TILE  1
+#define RADEON_BO_FLAGS_MICRO_TILE  2
+#define RADEON_BO_FLAGS_MICRO_TILE_SQUARE 0x20
+
 #ifdef ANDROID
 
 extern void*  __mmap2(void*, size_t, int, int, int, size_t);
@@ -58,11 +62,6 @@ static void* android_mmap2(void *addr, size_t size, int prot, int flags, int fd,
 
 #endif /* ANDROID */
 
-
-#define RADEON_BO_FLAGS_MACRO_TILE  1
-#define RADEON_BO_FLAGS_MICRO_TILE  2
-#define RADEON_BO_FLAGS_MICRO_TILE_SQUARE 0x20
-
 extern const struct pb_vtbl radeon_bo_vtbl;