From d7a1140c459d86aabd97b68994d2ff6f0fef0795 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tapani=20P=C3=A4lli?= <tapani.palli@intel.com>
Date: Fri, 9 Aug 2019 12:31:42 +0300
Subject: [PATCH] intel/isl: build android libmesa_isl for gen12
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
 src/intel/Android.isl.mk | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/intel/Android.isl.mk b/src/intel/Android.isl.mk
index 07a64b8ed1c..85093141c70 100644
--- a/src/intel/Android.isl.mk
+++ b/src/intel/Android.isl.mk
@@ -198,6 +198,25 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
+# ---------------------------------------
+# Build libmesa_isl_gen12
+# ---------------------------------------
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libmesa_isl_gen12
+
+LOCAL_SRC_FILES := $(ISL_GEN12_FILES)
+
+LOCAL_CFLAGS := -DGEN_VERSIONx10=120
+
+LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES)
+
+LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
 # ---------------------------------------
 # Build libmesa_isl_tiled_memcpy
 # ---------------------------------------
@@ -268,6 +287,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
 	libmesa_isl_gen9 \
 	libmesa_isl_gen10 \
 	libmesa_isl_gen11 \
+	libmesa_isl_gen12 \
 	libmesa_genxml \
 	libmesa_isl_tiled_memcpy
 
-- 
2.30.2