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 80634198a7032a79d9c53c02b9f3aec3bc08e219..8525cecfb793ffd0e84c1db083ab642340b9bdc7 100644 (file)
--- 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_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_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)
 
 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 31d33b255d64fe0836c15bccd77a2e2c6c1ecb4c..11ee103c66921d473935850e90628edc80a9bdce 100644 (file)
--- 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 \
        libetnaviv_drm \
        libfreedreno_drm \
        libfreedreno_ir3 \

+       libfreedreno_perfcntrs \

        libmesa_gallium \
        libpanfrost_bifrost \
        libpanfrost_decode \
        libmesa_gallium \
        libpanfrost_bifrost \
        libpanfrost_decode \