Mesa (staging/19.2): android: anv: libmesa_vulkan_common: add libmesa_util static dependency

[GitLab Mirror]

Module: Mesa
Branch: staging/19.2
Commit: 0d781fe4b8df644018e13f385640ac296498538c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0d781fe4b8df644018e13f385640ac296498538c

Author: Mauro Rossi <issor.oruam at gmail.com>
Date:   Sun Sep  8 17:35:22 2019 +0200

android: anv: libmesa_vulkan_common: add libmesa_util static dependency

Change needed to fix the following building error:

In file included from external/mesa/src/intel/vulkan/anv_device.c:43:
external/mesa/src/util/xmlpool.h:115:10: fatal error: 'xmlpool/options.h' file not found
         ^~~~~~~~~~~~~~~~~~~
1 error generated.

Fixes: 4dcb1ff ("anv: add support for driconf")
Signed-off-by: Mauro Rossi <issor.oruam at gmail.com>
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
(cherry picked from commit ae5ac26dfa13de84c09f897c828cf621729ce622)

---

 src/intel/Android.vulkan.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk
index f66ab5bdfa4..00eb49a38f3 100644
--- a/src/intel/Android.vulkan.mk
+++ b/src/intel/Android.vulkan.mk
@@ -211,7 +211,8 @@ LOCAL_STATIC_LIBRARIES := \
 	libmesa_nir \
 	libmesa_genxml \
 	libmesa_git_sha1 \
-	libmesa_vulkan_util
+	libmesa_vulkan_util \
+	libmesa_util
 
 # The rule generates both C and H files, but due to some strange
 # reason generating the files once leads to link-time issues.