From: Martin Fuzzey <martin.fuzzey@flowbird.group>
Date: Thu, 6 Feb 2020 18:07:16 +0000 (+0100)
Subject: freedreno: android: fix build of perfcounters.
X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=commitdiff_plain;h=d8bae10bfe0f487dcaec721743cd51441bcc12f5

freedreno: android: fix build of perfcounters.

Some dependencies were missing on android causing a build failure.

Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3736>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3736>
---

diff --git a/src/freedreno/Android.perfcntrs.mk b/src/freedreno/Android.perfcntrs.mk
index 80634198a70..8525cecfb79 100644
--- a/src/freedreno/Android.perfcntrs.mk
+++ b/src/freedreno/Android.perfcntrs.mk
@@ -31,13 +31,13 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := \
 	$(perfcntrs_SOURCES)
 
-LOCAL_C_INCLUDES :=
+LOCAL_C_INCLUDES := \
+	$(MESA_TOP)/src/gallium/include \
+	$(MESA_TOP)/src/gallium/auxiliary
 
 LOCAL_MODULE := libfreedreno_perfcntrs
 
-LOCAL_GENERATED_SOURCES := \
-	$(MESA_GEN_GLSL_H) \
-	$(MESA_GEN_NIR_H)
+LOCAL_STATIC_LIBRARIES := libfreedreno_registers
 
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk
index 31d33b255d6..11ee103c669 100644
--- a/src/gallium/targets/dri/Android.mk
+++ b/src/gallium/targets/dri/Android.mk
@@ -58,6 +58,7 @@ LOCAL_STATIC_LIBRARIES += \
 	libetnaviv_drm \
 	libfreedreno_drm \
 	libfreedreno_ir3 \
+	libfreedreno_perfcntrs \
 	libmesa_gallium \
 	libpanfrost_bifrost \
 	libpanfrost_decode \