From c575dae37a2efbe0ed4dbadf190c6473040f3321 Mon Sep 17 00:00:00 2001
From: Mauro Rossi <issor.oruam@gmail.com>
Date: Sun, 25 Apr 2021 11:49:26 +0200
Subject: [PATCH] android: amd/common: add nir include path
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

$(MESA_TOP)/src/compiler/nir include path is added
for both clarity and build errors preventive reasons

Cc: 21.0 21.1 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10443>
(cherry picked from commit a02328395de5b2eff4485fdaf9321bf1087c28fb)
---
 .pick_status.json         | 2 +-
 src/amd/Android.common.mk | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 2b524c49a5f..10d2e5ff214 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -499,7 +499,7 @@
         "description": "android: amd/common: add nir include path",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk
index d9aa66fd23e..23bf129d156 100644
--- a/src/amd/Android.common.mk
+++ b/src/amd/Android.common.mk
@@ -95,6 +95,7 @@ LOCAL_C_INCLUDES := \
 	$(MESA_TOP)/src/amd/common \
 	$(MESA_TOP)/src/amd/llvm \
 	$(MESA_TOP)/src/compiler \
+	$(MESA_TOP)/src/compiler/nir \
 	$(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \
 	$(MESA_TOP)/src/gallium/include \
 	$(MESA_TOP)/src/gallium/auxiliary \