include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(common_SOURCES)
-
-LOCAL_CFLAGS := \
- -DGALLIUM_STATIC_TARGETS=1 \
+LOCAL_SRC_FILES := \
+ $(common_SOURCES) \
+ $(dri2_SOURCES)
LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/mapi \
- $(MESA_TOP)/src/mesa \
+ $(MESA_TOP)/src/mesa
LOCAL_EXPORT_C_INCLUDE_DIRS := \
$(LOCAL_PATH) \
- $(LOCAL_C_INCLUDES) \
+ $(LOCAL_C_INCLUDES)
LOCAL_STATIC_LIBRARIES := \
- libmesa_dri_common \
+ libmesa_dri_common
-ifneq ($(filter swrast,$(MESA_GPU_DRIVERS)),)
-LOCAL_CFLAGS += -DGALLIUM_SOFTPIPE
+ifneq ($(HAVE_GALLIUM_SOFTPIPE),)
LOCAL_SRC_FILES += $(drisw_SOURCES)
-endif
-
-# swrast only?
-ifeq ($(MESA_GPU_DRIVERS),swrast)
-LOCAL_CFLAGS += -D__NOT_HAVE_DRM_H
-else
-LOCAL_SRC_FILES += $(dri2_SOURCES)
-LOCAL_SHARED_LIBRARIES := libdrm
+LOCAL_CFLAGS += -DGALLIUM_SOFTPIPE
endif
LOCAL_MODULE := libmesa_st_dri