Android: clean-up and fix DRI module path handling

[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 7575882fa473cc705ca96d55eac28123201a7cc2..056b223f2de2910a7b09e82a29172cc3214b0e1a 100644 (file)
--- a/src/mesa/drivers/dri/i965/Android.mk
+++ b/src/mesa/drivers/dri/i965/Android.mk
@@ -26,10 +26,14 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := i965_dri
+ifeq ($(MESA_LOLLIPOP_BUILD),true)
+LOCAL_MODULE_RELATIVE_PATH := $(MESA_DRI_MODULE_REL_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 := \
@@ -41,10 +45,10 @@ LOCAL_CFLAGS += \
 endif
 
 LOCAL_C_INCLUDES := \
-       $(i965_INCLUDES) \
        $(MESA_DRI_C_INCLUDES)
 
 LOCAL_SRC_FILES := \
+       $(i965_compiler_FILES) \
        $(i965_FILES)
 
 LOCAL_WHOLE_STATIC_LIBRARIES := \
@@ -55,7 +59,8 @@ LOCAL_SHARED_LIBRARIES := \
        libdrm_intel
 
 LOCAL_GENERATED_SOURCES := \
-       $(MESA_DRI_OPTIONS_H)
+       $(MESA_DRI_OPTIONS_H) \
+       $(MESA_GEN_NIR_H)
 
 include $(MESA_COMMON_MK)
 include $(BUILD_SHARED_LIBRARY)