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 935722c5397198c24161c78e481a1c8e7bda60ca..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 := \
        -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)) \
-       $(TARGET_OUT_HEADERS)/libdrm \
+       $(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 \
@@ -55,9 +54,6 @@ 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