From c6e584f194ea0d475e0fe1564c5491a2a535146a Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Mon, 16 Oct 2017 07:43:36 -0500 Subject: [PATCH] Android: add libmesa_nir dependency to libmesa_dricore 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.") Reviewed-by: Kenneth Graunke Signed-off-by: Rob Herring --- 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 c7715a50c90..34fd8581c2d 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