Android: clean-up and fix DRI module path handling

[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..7e7587b075328abe05881c137327782e2e963b61 100644 (file)
--- a/src/mesa/drivers/dri/Android.mk
+++ b/src/mesa/drivers/dri/Android.mk
@@ -28,24 +28,23 @@ include $(LOCAL_PATH)/common/Makefile.sources
 #-----------------------------------------------
 # Variables common to all DRI drivers
 
-MESA_DRI_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/dri
-MESA_DRI_MODULE_UNSTRIPPED_PATH := $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/dri
-
 MESA_DRI_CFLAGS := \
-       -DFEATURE_GL=1 \
-       -DFEATURE_ES1=1 \
-       -DFEATURE_ES2=1
+       -DHAVE_ANDROID_PLATFORM
 
 MESA_DRI_C_INCLUDES := \
        $(addprefix $(MESA_TOP)/, $(mesa_dri_common_INCLUDES)) \
-       $(DRM_TOP) \
-       $(DRM_TOP)/include/drm \
+       $(MESA_TOP)/src/gallium/include \
+       $(MESA_TOP)/src/gallium/auxiliary \
        external/expat/lib
 
 MESA_DRI_WHOLE_STATIC_LIBRARIES := \
        libmesa_glsl \
+       libmesa_compiler \
+       libmesa_nir \
+       libmesa_megadriver_stub \
        libmesa_dri_common \
-       libmesa_dricore
+       libmesa_dricore \
+       libmesa_util
 
 MESA_DRI_SHARED_LIBRARIES := \
        libcutils \
@@ -60,6 +59,10 @@ MESA_DRI_SHARED_LIBRARIES := \
 
 SUBDIRS := common
 
+ifneq ($(filter i915, $(MESA_GPU_DRIVERS)),)
+       SUBDIRS += i915
+endif
+
 ifneq ($(filter i965, $(MESA_GPU_DRIVERS)),)
        SUBDIRS += i965
 endif