i915: Remove most of the code under gen >= 4 checks.

[mesa.git] / src / mesa / drivers / dri / Android.mk

diff --git a/src/mesa/drivers/dri/Android.mk b/src/mesa/drivers/dri/Android.mk
index 67f656b78a07e189b5444521054de36300c0016e..88629531a9d628b127122a4fd226f138d69d1585 100644 (file)
--- a/src/mesa/drivers/dri/Android.mk
+++ b/src/mesa/drivers/dri/Android.mk
@@ -34,9 +34,11 @@ MESA_DRI_MODULE_UNSTRIPPED_PATH := $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/dri
 MESA_DRI_CFLAGS := \
        -DFEATURE_GL=1 \
        -DFEATURE_ES1=1 \
-       -DFEATURE_ES2=1
+       -DFEATURE_ES2=1 \
+       -DHAVE_ANDROID_PLATFORM
 
 MESA_DRI_C_INCLUDES := \
+       $(call intermediates-dir-for,STATIC_LIBRARIES,libmesa_dri_common) \
        $(addprefix $(MESA_TOP)/, $(mesa_dri_common_INCLUDES)) \
        $(DRM_TOP) \
        $(DRM_TOP)/include/drm \
@@ -55,11 +57,18 @@ MESA_DRI_SHARED_LIBRARIES := \
        libglapi \
        liblog
 
+# All DRI modules must add this to LOCAL_GENERATED_SOURCES.
+MESA_DRI_OPTIONS_H := $(call intermediates-dir-for,STATIC_LIBRARIES,libmesa_dri_common)/xmlpool/options.h
+
 #-----------------------------------------------
 # Build drivers and libmesa_dri_common
 
 SUBDIRS := common
 
+ifneq ($(filter i915, $(MESA_GPU_DRIVERS)),)
+       SUBDIRS += i915
+endif
+
 ifneq ($(filter i965, $(MESA_GPU_DRIVERS)),)
        SUBDIRS += i965
 endif