diff options
| author | Mauro Rossi <[email protected]> | 2016-05-31 00:20:28 +0200 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-06-02 22:31:00 +0100 |
| commit | 4143245c23c25a8b81c4ab6ca3d9211593edf542 (patch) | |
| tree | 8aaf0201064c879acb55b20c4048f7dbb7e140b8 | |
| parent | af1a0ae8cebb62fe9ce4b78c3e95185ea62ccdf0 (diff) | |
android: libmesa_glsl: add a dependency on libmesa_nir static
Fixes the following building error:
target C++: libmesa_glsl <= external/mesa/src/compiler/glsl/glsl_to_nir.cpp
In file included from external/mesa/src/compiler/glsl/glsl_to_nir.h:28:0,
from external/mesa/src/compiler/glsl/glsl_to_nir.cpp:28:
external/mesa/src/compiler/nir/nir.h:42:25: fatal error: nir_opcodes.h: No such file or directory
compilation terminated.
build/core/binary.mk:432: recipe for target 'out/target/product/x86/obj/STATIC_LIBRARIES/libmesa_glsl_intermediates/glsl/glsl_to_nir.o' failed
make: *** [out/target/product/x86/obj/STATIC_LIBRARIES/libmesa_glsl_intermediates/glsl/glsl_to_nir.o] Error 1
make: *** Waiting for unfinished jobs....
Cc: <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
| -rw-r--r-- | src/compiler/Android.glsl.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/compiler/Android.glsl.mk b/src/compiler/Android.glsl.mk index 5d2bc189978..21c1065a1bd 100644 --- a/src/compiler/Android.glsl.mk +++ b/src/compiler/Android.glsl.mk @@ -38,13 +38,14 @@ LOCAL_SRC_FILES := \ $(LIBGLSL_FILES) \ LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/compiler/nir \ $(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/mesa \ $(MESA_TOP)/src/gallium/include \ $(MESA_TOP)/src/gallium/auxiliary -LOCAL_STATIC_LIBRARIES := libmesa_compiler +LOCAL_STATIC_LIBRARIES := \ + libmesa_compiler \ + libmesa_nir LOCAL_MODULE := libmesa_glsl |