From: Mauro Rossi <issor.oruam@gmail.com>
Date: Fri, 19 Aug 2016 21:55:54 +0000 (+0200)
Subject: android: i965: add per-gen libmesa_i965_gen{7,75} static libraries
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9dc70a71f8550d952af876a66b23de3852235a9c;p=mesa.git

android: i965: add per-gen libmesa_i965_gen{7,75} static libraries

Needed to fix android build after commit e198983
which enabled genxml for gen{7,75} state setup

Android build fix for gen{8,9} will follow as incremental patch,
build tested successfully with all per-gen patches applied.
---

diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk
index 4afbd664cf9..d4c4628f366 100644
--- a/src/mesa/drivers/dri/i965/Android.mk
+++ b/src/mesa/drivers/dri/i965/Android.mk
@@ -40,7 +40,9 @@ I965_PERGEN_STATIC_LIBRARIES := \
 	libmesa_nir
 
 I965_PERGEN_LIBS := \
-	libmesa_i965_gen6
+	libmesa_i965_gen6 \
+	libmesa_i965_gen7 \
+	libmesa_i965_gen75
 
 # ---------------------------------------
 # Build libmesa_i965_gen6
@@ -63,6 +65,48 @@ LOCAL_CFLAGS := -DGEN_VERSIONx10=60
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
+# ---------------------------------------
+# Build libmesa_i965_gen7
+# ---------------------------------------
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libmesa_i965_gen7
+
+LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
+
+LOCAL_SRC_FILES := $(i965_gen7_FILES)
+
+LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES)
+
+LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_LIBRARIES)
+
+LOCAL_CFLAGS := -DGEN_VERSIONx10=70
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
+# ---------------------------------------
+# Build libmesa_i965_gen75
+# ---------------------------------------
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libmesa_i965_gen75
+
+LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
+
+LOCAL_SRC_FILES := $(i965_gen75_FILES)
+
+LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES)
+
+LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_LIBRARIES)
+
+LOCAL_CFLAGS := -DGEN_VERSIONx10=75
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
 # ---------------------------------------
 # Build i965_dri
 # ---------------------------------------