i965/nir/vec4: Prepare source and destination registers for ALU operations

[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 88629531a9d628b127122a4fd226f138d69d1585..42bfd77d4671f07dd98931c35f89b71f3273ef8d 100644 (file)
--- a/src/mesa/drivers/dri/Android.mk
+++ b/src/mesa/drivers/dri/Android.mk
@@ -32,22 +32,20 @@ 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 := \
-       $(call intermediates-dir-for,STATIC_LIBRARIES,libmesa_dri_common) \
        $(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_megadriver_stub \
        libmesa_dri_common \
-       libmesa_dricore
+       libmesa_dricore \
+       libmesa_util
 
 MESA_DRI_SHARED_LIBRARIES := \
        libcutils \
@@ -57,9 +55,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