summaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk15
1 files changed, 11 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index 02ce3f1609..ea6f101362 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,7 +24,7 @@
# BOARD_GPU_DRIVERS should be defined. The valid values are
#
# classic drivers:
-# gallium drivers: swrast i915g r600g vmwgfx
+# gallium drivers: swrast i915g r300g r600g vmwgfx
#
# The main target is libGLES_mesa. There is no classic drivers yet.
@@ -36,7 +36,7 @@ DRM_TOP := external/drm
DRM_GRALLOC_TOP := hardware/drm_gralloc
classic_drivers :=
-gallium_drivers := swrast i915g r600g vmwgfx
+gallium_drivers := swrast i915g r300g r600g vmwgfx
MESA_GPU_DRIVERS := $(BOARD_GPU_DRIVERS)
@@ -116,11 +116,16 @@ gallium_DRIVERS += libmesa_winsys_i915 libmesa_pipe_i915
LOCAL_SHARED_LIBRARIES += libdrm_intel
endif
-# r600g
-ifneq ($(filter r600g, $(MESA_GPU_DRIVERS)),)
+# r300g/r600g
+ifneq ($(filter r300g r600g, $(MESA_GPU_DRIVERS)),)
gallium_DRIVERS += libmesa_winsys_radeon
+ifneq ($(filter r300g, $(MESA_GPU_DRIVERS)),)
+gallium_DRIVERS += libmesa_pipe_r300
+endif
+ifneq ($(filter r600g, $(MESA_GPU_DRIVERS)),)
gallium_DRIVERS += libmesa_pipe_r600 libmesa_winsys_r600
endif
+endif
# vmwgfx
ifneq ($(filter vmwgfx, $(MESA_GPU_DRIVERS)),)
@@ -131,6 +136,8 @@ endif
# Notes about the order here:
#
# * libmesa_st_egl depends on libmesa_winsys_sw_android in $(gallium_DRIVERS)
+# * libmesa_pipe_r300 in $(gallium_DRIVERS) depends on libmesa_st_mesa and
+# libmesa_glsl
# * libmesa_st_mesa depends on libmesa_glsl
# * libmesa_glsl depends on libmesa_glsl_utils
#