From 64ff6b112e8f8a3fa897b66856241e591b9bfc82 Mon Sep 17 00:00:00 2001
From: Mauro Rossi <issor.oruam@gmail.com>
Date: Sat, 5 Sep 2020 23:31:28 +0200
Subject: [PATCH] android: freedreno/common: add libmesa_git_sha1 static
 dependency

Fixes the following building error:

external/mesa/src/freedreno/common/freedreno_uuid.c:30:10: fatal error: 'git_sha1.h' file not found
         ^~~~~~~~~~~~
1 error generated.

Fixes: e7458f19e ("freedreno/uuid: Generate meaningful device and driver UUID")
Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
Acked-by: Rob Clark <robdclark@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6625>
(cherry picked from commit 9d02d65f4643bd4885c40ca2fca4e1e8f7cc202e)
---
 .pick_status.json               | 2 +-
 src/freedreno/Android.common.mk | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 8d07faa0f24..c5969e71014 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1291,7 +1291,7 @@
         "description": "android: freedreno/common: add libmesa_git_sha1 static dependency",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "e7458f19e1de7d40ff8aa72b6a141f24d33451c6"
     },
diff --git a/src/freedreno/Android.common.mk b/src/freedreno/Android.common.mk
index 2bbf09b4088..6859f36730b 100644
--- a/src/freedreno/Android.common.mk
+++ b/src/freedreno/Android.common.mk
@@ -37,5 +37,7 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_MODULE := libfreedreno_common
 
+LOCAL_STATIC_LIBRARIES := libmesa_git_sha1
+
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)