<div dir="ltr"><div>Thanks for fixing these up!  I've already pushed the series, so these can be squashed and applied as one patch.  Unfortunately, I can't get them to apply to master and I can't figure out what's going wrong.  Mind squashing and rebasing?<br></div><br></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Aug 19, 2016 at 3:46 PM, Mauro Rossi <span dir="ltr"><<a href="mailto:issor.oruam@gmail.com" target="_blank">issor.oruam@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From 88e08ee520b7c8a14b17160a9e7102<wbr>d72fed8ecb Mon Sep 17 00:00:00 2001<br>
From: Mauro Rossi <<a href="mailto:issor.oruam@gmail.com">issor.oruam@gmail.com</a>><br>
Date: Sat, 20 Aug 2016 00:04:29 +0200<br>
Subject: [PATCH 3/3] android: i965: add per-gen libmesa_i965_gen{8,9} static<br>
<br>
Needed to fix android build after commit 16a9fcb<br>
which enabled genxml for gen{8,9} state setup<br>
<br>
This is the last patch needed, android build tested successfully.<br>
<span class="">---<br>
 src/mesa/drivers/dri/i965/<wbr>Android.mk | 46 ++++++++++++++++++++++++++++++<wbr>+++++-<br>
 1 file changed, 45 insertions(+), 1 deletion(-)<br>
<br>
diff --git a/src/mesa/drivers/dri/i965/<wbr>Android.mk<br>
b/src/mesa/drivers/dri/i965/<wbr>Android.mk<br>
</span>index 9dea20b..e6bcedb 100644<br>
--- a/src/mesa/drivers/dri/i965/<wbr>Android.mk<br>
+++ b/src/mesa/drivers/dri/i965/<wbr>Android.mk<br>
@@ -42,7 +42,9 @@ I965_PERGEN_STATIC_LIBRARIES := \<br>
 I965_PERGEN_LIBS := \<br>
  libmesa_i965_gen6 \<br>
  libmesa_i965_gen7 \<br>
- libmesa_i965_gen75<br>
+ libmesa_i965_gen75 \<br>
+ libmesa_i965_gen8 \<br>
+ libmesa_i965_gen9<br>
<span class=""><br>
 # ------------------------------<wbr>---------<br>
 # Build libmesa_i965_gen6<br>
</span>@@ -108,6 +110,48 @@ include $(MESA_COMMON_MK)<br>
 include $(BUILD_STATIC_LIBRARY)<br>
<br>
 # ------------------------------<wbr>---------<br>
+# Build libmesa_i965_gen8<br>
<span class="">+# ------------------------------<wbr>---------<br>
+<br>
+include $(CLEAR_VARS)<br>
+<br>
</span>+LOCAL_MODULE := libmesa_i965_gen8<br>
<span class="">+<br>
+LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)<br>
+<br>
</span>+LOCAL_SRC_FILES := $(i965_gen8_FILES)<br>
<span class="">+<br>
+LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_<wbr>LIBRARIES)<br>
+<br>
+LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_<wbr>LIBRARIES)<br>
+<br>
</span>+LOCAL_CFLAGS := -DGEN_VERSIONx10=80<br>
<span class="">+<br>
+include $(MESA_COMMON_MK)<br>
+include $(BUILD_STATIC_LIBRARY)<br>
+<br>
+# ------------------------------<wbr>---------<br>
</span>+# Build libmesa_i965_gen9<br>
<span class="">+# ------------------------------<wbr>---------<br>
+<br>
+include $(CLEAR_VARS)<br>
+<br>
</span>+LOCAL_MODULE := libmesa_i965_gen9<br>
<span class="">+<br>
+LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)<br>
+<br>
</span>+LOCAL_SRC_FILES := $(i965_gen9_FILES)<br>
<span class="">+<br>
+LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_<wbr>LIBRARIES)<br>
+<br>
+LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_<wbr>LIBRARIES)<br>
+<br>
</span>+LOCAL_CFLAGS := -DGEN_VERSIONx10=90<br>
<div class="HOEnZb"><div class="h5">+<br>
+include $(MESA_COMMON_MK)<br>
+include $(BUILD_STATIC_LIBRARY)<br>
+<br>
+# ------------------------------<wbr>---------<br>
 # Build i965_dri<br>
 # ------------------------------<wbr>---------<br>
<br>
--<br>
2.7.4<br>
</div></div></blockquote></div><br></div>