vk: Add four unit tests for our lock-free data-structures

[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 3f49c8b17618a2dac1a2ab6132aeea6b8440a16f..a9b963a9eca22cda1b82f88df8f26ded73defba3 100644 (file)
--- a/src/mesa/drivers/dri/i965/Android.mk
+++ b/src/mesa/drivers/dri/i965/Android.mk
@@ -26,28 +26,29 @@ 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
 
-# Overriding LOCAL_CC below is an ugly workaround.  We cannot place -std=c99
-# in LOCAL_C_FLAGS because Android appends LOCAL_C_FLAGS to LOCAL_CPP_FLAGS.
-LOCAL_CC := $(TARGET_CC) -std=c99
-
 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_C_SOURCES) \
-       $(i965_CXX_SOURCES) \
-       $(i965_ASM_SOURCES)
+       $(i965_FILES)
 
 LOCAL_WHOLE_STATIC_LIBRARIES := \
        $(MESA_DRI_WHOLE_STATIC_LIBRARIES)
@@ -56,5 +57,8 @@ LOCAL_SHARED_LIBRARIES := \
        $(MESA_DRI_SHARED_LIBRARIES) \
        libdrm_intel
 
+LOCAL_GENERATED_SOURCES := \
+       $(MESA_DRI_OPTIONS_H)
+
 include $(MESA_COMMON_MK)
 include $(BUILD_SHARED_LIBRARY)