Mesa (master): android: panfrost: Redirect cmdstream includes through GenXML (v2)

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: acf756a64fee4cb1305df73e53aca7a40e56b7cb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=acf756a64fee4cb1305df73e53aca7a40e56b7cb

Author: Mauro Rossi <issor.oruam at gmail.com>
Date:   Fri Aug 14 17:38:29 2020 +0200

android: panfrost: Redirect cmdstream includes through GenXML (v2)

bifrost requires both "pafrost/lib/midgard_pack.h" and "midgard_pack.h" headers

Fixes the following building error:

In file included from external/mesa/src/panfrost/bifrost/cmdline.c:33:
In file included from external/mesa/src/panfrost/bifrost/test/bit.h:31:
external/mesa/src/panfrost/lib/pan_device.h:40:10: fatal error: 'midgard_pack.h' file not found
#include <midgard_pack.h>
         ^~~~~~~~~~~~~~~~
1 error generated.

Fixes: bce1a7e9 ("android: panfrost: Redirect cmdstream includes through GenXML")
Fixes: 88dc4c21 ("panfrost: Redirect cmdstream includes through GenXML")
Signed-off-by: Mauro Rossi <issor.oruam at gmail.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6322>

---

 src/panfrost/Android.lib.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/panfrost/Android.lib.mk b/src/panfrost/Android.lib.mk
index ab5d2126a85..4134c5f2b5a 100644
--- a/src/panfrost/Android.lib.mk
+++ b/src/panfrost/Android.lib.mk
@@ -49,6 +49,7 @@ $(intermediates)/panfrost/lib/midgard_pack.h: $(midgard_pack_deps)
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
 	$(MESA_TOP)/src/panfrost/lib/ \
+	$(intermediates)/panfrost/lib/ \
 	$(intermediates)
 
 include $(MESA_COMMON_MK)