diff options
Diffstat (limited to 'src/gallium')
| -rwxr-xr-x | src/gallium/drivers/r300/Android.mk | 3 | ||||
| -rw-r--r-- | src/gallium/targets/Android.mk | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/gallium/drivers/r300/Android.mk b/src/gallium/drivers/r300/Android.mk index 0690170386..acb9a87b83 100755 --- a/src/gallium/drivers/r300/Android.mk +++ b/src/gallium/drivers/r300/Android.mk @@ -48,9 +48,6 @@ LOCAL_C_INCLUDES := \ LOCAL_MODULE := libmesa_pipe_r300 -LOCAL_SHARED_LIBRARIES += \ - r300_dri - include $(BUILD_STATIC_LIBRARY) endif # MESA_BUILD_R600G diff --git a/src/gallium/targets/Android.mk b/src/gallium/targets/Android.mk index 8de7cf6e9f..55cd354a5d 100644 --- a/src/gallium/targets/Android.mk +++ b/src/gallium/targets/Android.mk @@ -67,14 +67,14 @@ LOCAL_SHARED_LIBRARIES += \ endif # MESA_BUILD_I915G ifeq ($(strip $(MESA_BUILD_R600G)),true) -LOCAL_CFLAGS += -D_EGL_PIPE_R600 -#-D_EGL_PIPE_R300 +LOCAL_CFLAGS += -D_EGL_PIPE_R600 -D_EGL_PIPE_R300 LOCAL_STATIC_LIBRARIES := \ libmesa_pipe_r600 \ libmesa_winsys_r600 \ + libmesa_pipe_r300 \ + libmesa_winsys_r300 \ + libr300_dri \ $(LOCAL_STATIC_LIBRARIES) -# libmesa_pipe_r300 \ -# libmesa_winsys_r300 \ LOCAL_SHARED_LIBRARIES += \ libdrm \ libdrm_radeon |