drisw: Fix drawable creation against non-default screens

[mesa.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index ad7feed20527cde1931823e7dd56be5a0abf64dd..0d5917ce5f277162c3d19048526ec7631fe10f88 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -23,10 +23,11 @@
 
 # BOARD_GPU_DRIVERS should be defined.  The valid values are
 #
-#   classic drivers:
-#   gallium drivers: swrast r600g vmwgfx
+#   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,10 +36,10 @@ MESA_PYTHON2 := python
 DRM_TOP := external/drm
 DRM_GRALLOC_TOP := hardware/drm_gralloc
 
-classic_drivers :=
-gallium_drivers := swrast r600g vmwgfx
+classic_drivers := i915 i965
+gallium_drivers := swrast i915g nouveau r300g r600g vmwgfx
 
-MESA_GPU_DRIVERS := $(BOARD_GPU_DRIVERS)
+MESA_GPU_DRIVERS := $(strip $(BOARD_GPU_DRIVERS))
 
 # warn about invalid drivers
 invalid_drivers := $(filter-out \
@@ -68,6 +69,7 @@ else
 MESA_BUILD_GALLIUM := false
 endif
 
+# add subdirectories
 ifneq ($(strip $(MESA_GPU_DRIVERS)),)
 
 SUBDIRS := \
@@ -76,77 +78,17 @@ SUBDIRS := \
        src/mesa \
        src/egl/main
 
-ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
-SUBDIRS += src/gallium
+ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
+SUBDIRS += \
+       src/egl/drivers/dri2 \
+       src/mesa/drivers/dri
 endif
 
-# ---------------------------------------
-# Build libGLES_mesa
-# ---------------------------------------
-
-LOCAL_PATH := $(MESA_TOP)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES :=
-LOCAL_CFLAGS :=
-LOCAL_C_INCLUDES :=
-
-LOCAL_STATIC_LIBRARIES :=
-LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_egl
-
-LOCAL_SHARED_LIBRARIES := \
-       libglapi \
-       libdrm \
-       libdl \
-       libhardware \
-       liblog \
-       libcutils
-
 ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
-
-gallium_DRIVERS :=
-
-# swrast
-gallium_DRIVERS += libmesa_pipe_softpipe libmesa_winsys_sw_android
-
-# r600g
-ifneq ($(filter r600g, $(MESA_GPU_DRIVERS)),)
-gallium_DRIVERS += libmesa_winsys_radeon
-gallium_DRIVERS += libmesa_pipe_r600 libmesa_winsys_r600
-endif
-
-# vmwgfx
-ifneq ($(filter vmwgfx, $(MESA_GPU_DRIVERS)),)
-gallium_DRIVERS += libmesa_winsys_svga libmesa_pipe_svga
+SUBDIRS += src/gallium
 endif
 
-#
-# Notes about the order here:
-#
-#  * libmesa_st_egl depends on libmesa_winsys_sw_android in $(gallium_DRIVERS)
-#  * libmesa_st_mesa depends on libmesa_glsl
-#  * libmesa_glsl depends on libmesa_glsl_utils
-#
-LOCAL_STATIC_LIBRARIES := \
-       libmesa_egl_gallium \
-       libmesa_st_egl \
-       $(gallium_DRIVERS) \
-       libmesa_st_mesa \
-       libmesa_glsl \
-       libmesa_glsl_utils \
-       libmesa_gallium \
-       $(LOCAL_STATIC_LIBRARIES)
-
-endif # MESA_BUILD_GALLIUM
-
-LOCAL_MODULE := libGLES_mesa
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl
-
-include $(MESA_COMMON_MK)
-include $(BUILD_SHARED_LIBRARY)
-
 mkfiles := $(patsubst %,$(MESA_TOP)/%/Android.mk,$(SUBDIRS))
 include $(mkfiles)
 
-endif # MESA_GPU_DRIVERS
+endif