i965: Move device info initialization to common code

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

diff --git a/src/mesa/drivers/dri/i915/Android.mk b/src/mesa/drivers/dri/i915/Android.mk
index 741ea260e94961d004315d51d27791fc8ea2b1db..b1054aa6e285ecf28128cb51c4fb9556fb10bf99 100644 (file)
--- a/src/mesa/drivers/dri/i915/Android.mk
+++ b/src/mesa/drivers/dri/i915/Android.mk
@@ -26,12 +26,8 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := i915_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
+LOCAL_MODULE_RELATIVE_PATH := $(MESA_DRI_MODULE_REL_PATH)
+LOCAL_LDFLAGS += $(MESA_DRI_LDFLAGS)
 
 # Import variables i915_FILES.
 include $(LOCAL_PATH)/Makefile.sources
@@ -54,7 +50,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)