Module: Mesa
Branch: master
Commit: 0e813365501d5580bbc2a93dc14f30b52e388c76
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=0e813365501d5580bbc2a93dc14f30b52e388c76
Author: Mauro Rossi <issor.or...@gmail.com>
Date: Tue May 17 22:48:36 2016 +0200
android: fix building error in libmesa_st_mesa
Fixes the following building error due to libmesa_nir dependency:
In file included from
external/mesa/src/mesa/state_tracker/st_glsl_to_nir.cpp:44:0:
external/mesa/src/compiler/nir/nir.h:42:25: fatal error: nir_opcodes.h: No such
file or directory
#include "nir_opcodes.h"
^
compilation terminated.
build/core/binary.mk:706: recipe for target
'out/target/product/x86/obj/STATIC_LIBRARIES/libmesa_st_mesa_intermediates/state_tracker/st_glsl_to_nir.o'
failed
make: ***
[out/target/product/x86/obj/STATIC_LIBRARIES/libmesa_st_mesa_intermediates/state_tracker/st_glsl_to_nir.o]
Error 1
make: *** Waiting for unfinished jobs....
Reviewed-by: Rob Herring <r...@kernel.org>
Signed-off-by: Rob Clark <robcl...@freedesktop.org>
---
src/mesa/Android.libmesa_st_mesa.mk | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/mesa/Android.libmesa_st_mesa.mk
b/src/mesa/Android.libmesa_st_mesa.mk
index bbd3956..785b6de 100644
--- a/src/mesa/Android.libmesa_st_mesa.mk
+++ b/src/mesa/Android.libmesa_st_mesa.mk
@@ -63,6 +63,8 @@ LOCAL_C_INCLUDES := \
LOCAL_WHOLE_STATIC_LIBRARIES += \
libmesa_program
+LOCAL_STATIC_LIBRARIES += libmesa_nir
+
include $(LOCAL_PATH)/Android.gen.mk
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
