diff options
| author | Rob Herring <robh@kernel.org> | 2017-10-16 07:43:36 -0500 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2017-10-16 14:49:37 -0500 |
| commit | c6e584f194ea0d475e0fe1564c5491a2a535146a (patch) | |
| tree | 3a62f4ae50699476719a3beebd7f423838153cf1 | |
| parent | 2c4097aff1b19134d5b03eef4118439336f15b97 (diff) | |
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 <kenneth@whitecape.org>
Signed-off-by: Rob Herring <robh@kernel.org>
| -rw-r--r-- | src/mesa/Android.libmesa_dricore.mk | 3 |
1 files changed, 3 insertions, 0 deletions
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 |