Commit 32fcced7b479 ("meta: Unset the textures_used_by_txf bitfield.")
added a dependency in libmesa_dricore to NIR headers, but failed to add
libmesa_nir as a dependency resulting in a build error:
In file included from external/mesa3d/src/mesa/drivers/common/meta.c:90:
external/mesa3d/src/compiler/nir/nir.h:48:10: fatal error: 'nir_opcodes.h' file
not found
Add libmesa_nir as a static library dependency to libmesa_dricore.
Fixes: 32fcced7b479 ("meta: Unset the textures_used_by_txf bitfield.")
Cc: Kenneth Graunke <[email protected]>
Signed-off-by: Rob Herring <[email protected]>
---
v2:
- Use LOCAL_STATIC_LIBRARIES as otherwise we get duplicate symbols.
src/mesa/Android.libmesa_dricore.mk | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/mesa/Android.libmesa_dricore.mk
b/src/mesa/Android.libmesa_dricore.mk
index c7715a50c90e..34fd8581c2df 100644
--- a/src/mesa/Android.libmesa_dricore.mk
+++ b/src/mesa/Android.libmesa_dricore.mk
@@ -64,6 +64,9 @@ LOCAL_C_INCLUDES := \
LOCAL_GENERATED_SOURCES += \
$(MESA_GEN_GLSL_H)
+LOCAL_STATIC_LIBRARIES += \
+ libmesa_nir
+
LOCAL_WHOLE_STATIC_LIBRARIES += \
libmesa_program \
libmesa_git_sha1
--
2.11.0
_______________________________________________
mesa-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
