summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorMauro Rossi <issor.oruam@gmail.com>2016-08-19 23:36:11 +0200
committerJason Ekstrand <jason.ekstrand@intel.com>2016-08-20 16:18:26 -0700
commit7478ddad2961f307b29b42929853414b068a84a8 (patch)
tree7d113cab7dbfaa9d48dbaf1454a26add6d041341 /src/mesa/drivers/dri
parent7db81d9a873e2e8008c245169fe158bf8b05e92b (diff)
android: i965: add per-gen libmesa_i965_gen6 static library
Needed to fix android build after commit c8bc1ae where new per-gen genX_blorp.c source replaced gen6_blorp.c for gen6 Android build fixes for gen{7,75} and gen{8,9} will follow as incremental patches, build tested successfully with all per-gen patches applied.
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/i965/Android.mk48
1 files changed, 45 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk
index e8a379f6b48..4afbd664cf9 100644
--- a/src/mesa/drivers/dri/i965/Android.mk
+++ b/src/mesa/drivers/dri/i965/Android.mk
@@ -23,6 +23,50 @@
#
LOCAL_PATH := $(call my-dir)
+
+# Import variables i965_FILES.
+include $(LOCAL_PATH)/Makefile.sources
+
+I965_PERGEN_COMMON_INCLUDES := \
+ $(MESA_DRI_C_INCLUDES) \
+ $(MESA_TOP)/src/intel
+
+I965_PERGEN_SHARED_LIBRARIES := \
+ $(MESA_DRI_SHARED_LIBRARIES) \
+ libdrm_intel
+
+I965_PERGEN_STATIC_LIBRARIES := \
+ libmesa_genxml \
+ libmesa_nir
+
+I965_PERGEN_LIBS := \
+ libmesa_i965_gen6
+
+# ---------------------------------------
+# Build libmesa_i965_gen6
+# ---------------------------------------
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libmesa_i965_gen6
+
+LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
+
+LOCAL_SRC_FILES := $(i965_gen6_FILES)
+
+LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES)
+
+LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_LIBRARIES)
+
+LOCAL_CFLAGS := -DGEN_VERSIONx10=60
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
+# ---------------------------------------
+# Build i965_dri
+# ---------------------------------------
+
include $(CLEAR_VARS)
LOCAL_MODULE := i965_dri
@@ -33,9 +77,6 @@ LOCAL_MODULE_PATH := $(MESA_DRI_MODULE_PATH)
LOCAL_UNSTRIPPED_PATH := $(MESA_DRI_MODULE_UNSTRIPPED_PATH)
endif
-# Import variables i965_FILES.
-include $(LOCAL_PATH)/Makefile.sources
-
LOCAL_CFLAGS := \
$(MESA_DRI_CFLAGS)
@@ -53,6 +94,7 @@ LOCAL_SRC_FILES := \
LOCAL_WHOLE_STATIC_LIBRARIES := \
$(MESA_DRI_WHOLE_STATIC_LIBRARIES) \
+ $(I965_PERGEN_LIBS) \
libmesa_isl
LOCAL_SHARED_LIBRARIES := \