summaryrefslogtreecommitdiffstats
path: root/src/mesa/Android.libmesa_st_mesa.mk
diff options
context:
space:
mode:
authorMauro Rossi <[email protected]>2016-05-17 22:48:36 +0200
committerRob Clark <[email protected]>2016-05-17 17:07:28 -0400
commit0e813365501d5580bbc2a93dc14f30b52e388c76 (patch)
tree3d7a7f54db2452e9c806e7aa25c35a40469f9880 /src/mesa/Android.libmesa_st_mesa.mk
parent941756f09271cd41b8a8bb9373caa58629306bd5 (diff)
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 <[email protected]> Signed-off-by: Rob Clark <[email protected]>
Diffstat (limited to 'src/mesa/Android.libmesa_st_mesa.mk')
-rw-r--r--src/mesa/Android.libmesa_st_mesa.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/Android.libmesa_st_mesa.mk b/src/mesa/Android.libmesa_st_mesa.mk
index bbd39562785..785b6de25c0 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)