X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2FAndroid.mk;h=935722c5397198c24161c78e481a1c8e7bda60ca;hb=2c50212b14da27de4e3da62488ae4e35c069d84e;hp=b8ccd0c1b217e3b8f5668c6797bf9ed7b312f868;hpb=1995d1e2070f8cda9e2ce489c694e0949749c8cb;p=mesa.git

diff --git a/src/mesa/drivers/dri/Android.mk b/src/mesa/drivers/dri/Android.mk
index b8ccd0c1b21..935722c5397 100644
--- a/src/mesa/drivers/dri/Android.mk
+++ b/src/mesa/drivers/dri/Android.mk
@@ -31,14 +31,19 @@ include $(LOCAL_PATH)/common/Makefile.sources
 MESA_DRI_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/dri
 MESA_DRI_MODULE_UNSTRIPPED_PATH := $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/dri
 
+MESA_DRI_CFLAGS := \
+	-DHAVE_ANDROID_PLATFORM
+
 MESA_DRI_C_INCLUDES := \
+	$(MESA_TOP)/src \
+	$(call intermediates-dir-for,STATIC_LIBRARIES,libmesa_dri_common) \
 	$(addprefix $(MESA_TOP)/, $(mesa_dri_common_INCLUDES)) \
-	$(DRM_TOP) \
-	$(DRM_TOP)/include/drm \
+	$(TARGET_OUT_HEADERS)/libdrm \
 	external/expat/lib
 
 MESA_DRI_WHOLE_STATIC_LIBRARIES := \
 	libmesa_glsl \
+	libmesa_megadriver_stub \
 	libmesa_dri_common \
 	libmesa_dricore
 
@@ -50,11 +55,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