i965: Add HiZ operation state to brw_context

[mesa.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index ed68aec65ca1a6d3048759c9a96df98ea6472ba4..0c07d5e02d1afe36def1081a464b77785295bf2a 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -23,10 +23,11 @@
 
 # BOARD_GPU_DRIVERS should be defined.  The valid values are
 #
-#   classic drivers:
+#   classic drivers: i915 i965
 #   gallium drivers: swrast i915g nouveau r300g r600g vmwgfx
 #
-# The main target is libGLES_mesa.  There is no classic drivers yet.
+# The main target is libGLES_mesa.  For each classic driver enabled, a DRI
+# module will also be built.  DRI modules will be loaded by libGLES_mesa.
 
 MESA_TOP := $(call my-dir)
 MESA_COMMON_MK := $(MESA_TOP)/Android.common.mk
@@ -35,7 +36,7 @@ MESA_PYTHON2 := python
 DRM_TOP := external/drm
 DRM_GRALLOC_TOP := hardware/drm_gralloc
 
-classic_drivers :=
+classic_drivers := i915 i965
 gallium_drivers := swrast i915g nouveau r300g r600g vmwgfx
 
 MESA_GPU_DRIVERS := $(strip $(BOARD_GPU_DRIVERS))
@@ -76,6 +77,12 @@ SUBDIRS := \
        src/mesa \
        src/egl/main
 
+ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
+SUBDIRS += \
+       src/egl/drivers/dri2 \
+       src/mesa/drivers/dri
+endif
+
 ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
 SUBDIRS += src/gallium
 endif
@@ -107,6 +114,10 @@ ifneq ($(MESA_GPU_DRIVERS),swrast)
 LOCAL_SHARED_LIBRARIES += libdrm
 endif
 
+ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
+LOCAL_STATIC_LIBRARIES += libmesa_egl_dri2
+endif
+
 ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
 
 gallium_DRIVERS :=
@@ -124,9 +135,9 @@ endif
 ifneq ($(filter nouveau, $(MESA_GPU_DRIVERS)),)
 gallium_DRIVERS += \
        libmesa_winsys_nouveau \
-       libmesa_pipe_nvc0 \
-       libmesa_pipe_nv50 \
        libmesa_pipe_nvfx \
+       libmesa_pipe_nv50 \
+       libmesa_pipe_nvc0 \
        libmesa_pipe_nouveau
 LOCAL_SHARED_LIBRARIES += libdrm_nouveau
 endif
@@ -138,7 +149,7 @@ 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
+gallium_DRIVERS += libmesa_pipe_r600
 endif
 endif