[Mesa-dev] [PATCH] android: fix build issues with genxml, isl

[Mauro Rossi]

> While you're at it, I've got another build-breaking branch here:
>
> https://cgit.freedesktop.org/~jekstrand/mesa/log/?h=wip/blorp-vulkan
>
> It's almost reviewed so I'll be pushing soon. If you could provide a
> squash-in, that would be great.
>
> --Jason

Hi Jason,

here it is, built marshmallow-x86 successfully after breaking commit
"i965: Move blorp into src/intel/blorp"
also attached to email, in case of gmail issues.

This patch has to be applied on top of  my former "[PATCH] android:
intel: Flatten the makefile structure"
KR

Mauro

>From 3ae8ea625b5cb091438de421d9762ea8bcb8e2bc Mon Sep 17 00:00:00 2001
From: Mauro Rossi <issor.oruam at gmail.com>
Date: Mon, 29 Aug 2016 03:08:02 +0200
Subject: [PATCH] android: i965: Move blorp into src/intel/blorp

Port to android of commit "i965: Move blorp into src/intel/blorp"

libmesa_blorp static library module is built by Android.blorp.mk

the necessary dependencies and includes are declared
and nir_opcodes.h generated header is included by using
the macro generated-sources-dir-for which requires LOCAL_MODULE_CLASS
---
 src/intel/Android.blorp.mk           | 47 ++++++++++++++++++++++++++++++++++++
 src/intel/Android.mk                 |  1 +
 src/mesa/drivers/dri/i965/Android.mk |  1 +
 3 files changed, 49 insertions(+)
 create mode 100644 src/intel/Android.blorp.mk

diff --git a/src/intel/Android.blorp.mk b/src/intel/Android.blorp.mk
new file mode 100644
index 0000000..268d5eb
--- /dev/null
+++ b/src/intel/Android.blorp.mk
@@ -0,0 +1,47 @@
+# Copyright © 2016 Intel Corporation
+# Copyright © 2016 Mauro Rossi <issor.oruam at gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+# ---------------------------------------
+# Build libmesa_blorp
+# ---------------------------------------
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libmesa_blorp
+
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+
+LOCAL_SRC_FILES := $(BLORP_FILES)
+
+LOCAL_C_INCLUDES := := \
+ $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \
+ $(MESA_TOP)/src/gallium/auxiliary \
+ $(MESA_TOP)/src/gallium/include \
+ $(MESA_TOP)/src/mapi \
+ $(MESA_TOP)/src/mesa \
+ $(MESA_TOP)/src/mesa/drivers/dri/i965
+
+LOCAL_STATIC_LIBRARIES := libmesa_nir
+
+LOCAL_SHARED_LIBRARIES := libdrm_intel
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/src/intel/Android.mk b/src/intel/Android.mk
index 114b111..0e9c29d 100644
--- a/src/intel/Android.mk
+++ b/src/intel/Android.mk
@@ -25,5 +25,6 @@ LOCAL_PATH := $(call my-dir)
 # Import variables
 include $(LOCAL_PATH)/Makefile.sources

+include $(LOCAL_PATH)/Android.blorp.mk
 include $(LOCAL_PATH)/Android.genxml.mk
 include $(LOCAL_PATH)/Android.isl.mk
diff --git a/src/mesa/drivers/dri/i965/Android.mk
b/src/mesa/drivers/dri/i965/Android.mk
index e6bcedb..32adb9a 100644
--- a/src/mesa/drivers/dri/i965/Android.mk
+++ b/src/mesa/drivers/dri/i965/Android.mk
@@ -178,6 +178,7 @@ LOCAL_SRC_FILES := \
 LOCAL_WHOLE_STATIC_LIBRARIES := \
  $(MESA_DRI_WHOLE_STATIC_LIBRARIES) \
  $(I965_PERGEN_LIBS) \
+ libmesa_blorp \
  libmesa_isl

 LOCAL_SHARED_LIBRARIES := \
-- 
2.7.4
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-android-i965-Move-blorp-into-src-intel-blorp.patch
Type: text/x-patch
Size: 3579 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20160829/1393b77a/attachment.bin>