From d8bae10bfe0f487dcaec721743cd51441bcc12f5 Mon Sep 17 00:00:00 2001 From: Martin Fuzzey Date: Thu, 6 Feb 2020 19:07:16 +0100 Subject: [PATCH] freedreno: android: fix build of perfcounters. Some dependencies were missing on android causing a build failure. Tested-by: Marge Bot Part-of: --- src/freedreno/Android.perfcntrs.mk | 8 ++++---- src/gallium/targets/dri/Android.mk | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) 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 \ -- 2.30.2