i965/nir/vec4: Implement linear interpolation

[mesa.git] / src / mesa / drivers / dri / i965 / Android.mk

diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk
index 7e3fd65e880a6c061b606e951097f887d9f3a03e..a9b963a9eca22cda1b82f88df8f26ded73defba3 100644 (file)
--- a/src/mesa/drivers/dri/i965/Android.mk
+++ b/src/mesa/drivers/dri/i965/Android.mk
@@ -26,19 +26,26 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := i965_dri
+ifeq ($(MESA_LOLLIPOP_BUILD),true)
+LOCAL_MODULE_RELATIVE_PATH := $(notdir $(MESA_DRI_MODULE_PATH))
+else
 LOCAL_MODULE_PATH := $(MESA_DRI_MODULE_PATH)
 LOCAL_UNSTRIPPED_PATH := $(MESA_DRI_MODULE_UNSTRIPPED_PATH)
+endif
 
-# Import variables i965_*.
+# Import variables i965_FILES.
 include $(LOCAL_PATH)/Makefile.sources
 
 LOCAL_CFLAGS := \
        $(MESA_DRI_CFLAGS)
 
+ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
+LOCAL_CFLAGS += \
+       -DUSE_SSE41
+endif
+
 LOCAL_C_INCLUDES := \
-       $(i965_INCLUDES) \
-       $(MESA_DRI_C_INCLUDES) \
-       $(DRM_TOP)/intel
+       $(MESA_DRI_C_INCLUDES)
 
 LOCAL_SRC_FILES := \
        $(i965_FILES)