From 183ca88a91d3e8addf015e56f4c2eb56e3f3ba0e Mon Sep 17 00:00:00 2001
From: Mauro Rossi <issor.oruam@gmail.com>
Date: Thu, 17 Sep 2020 21:16:20 +0200
Subject: [PATCH] android: pan/bi: Use new packing

Fixes the following building error:

external/mesa/src/panfrost/bifrost/bi_pack.c:26:10: fatal error: 'bi_generated_pack.h' file not found
         ^~~~~~~~~~~~~~~~~~~~~
1 error generated.

Fixes: 2ff53879 ("pan/bi: Use new packing")
Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6765>
---
 src/panfrost/Android.bifrost.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/panfrost/Android.bifrost.mk b/src/panfrost/Android.bifrost.mk
index 7d3fe48ca28..3d8f9b1c009 100644
--- a/src/panfrost/Android.bifrost.mk
+++ b/src/panfrost/Android.bifrost.mk
@@ -71,6 +71,7 @@ LOCAL_STATIC_LIBRARIES := \
 LOCAL_GENERATED_SOURCES := \
 	$(intermediates)/bifrost_nir_algebraic.c \
 	$(intermediates)/bifrost_gen_disasms.c \
+	$(intermediates)/bi_generated_pack.h \
 	$(MESA_GEN_GLSL_H)
 
 bifrost_nir_algebraic_gen := $(LOCAL_PATH)/bifrost/bifrost_nir_algebraic.py
@@ -88,6 +89,13 @@ $(intermediates)/bifrost_gen_disasms.c: $(bifrost_gen_disasms_deps)
 	@mkdir -p $(dir $@)
 	$(hide) $(MESA_PYTHON2) $(bifrost_gen_disasms_gen) $< > $@
 
+bi_generated_pack_gen := $(LOCAL_PATH)/bifrost/gen_pack.py
+bi_generated_pack_deps := $(LOCAL_PATH)/bifrost/ISA.xml
+
+$(intermediates)/bi_generated_pack.h: $(bi_generated_pack_deps)
+	@mkdir -p $(dir $@)
+	$(hide) $(MESA_PYTHON2) $(bi_generated_pack_gen) $< > $@
+
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
 	$(MESA_TOP)/src/panfrost/bifrost/ \