OSDN Git Service

android: libmesa_glsl: add a dependency on libmesa_nir static
authorMauro Rossi <issor.oruam@gmail.com>
Mon, 30 May 2016 22:20:28 +0000 (00:20 +0200)
committerEmil Velikov <emil.l.velikov@gmail.com>
Thu, 2 Jun 2016 21:35:29 +0000 (22:35 +0100)
commit702a1121c954ee5342dc22ac22a814ae40d70e1f
treecaec7fdd0fdb698eaedaeeb50a9937dc7991513b
parent9a21315ea91d150e391cfc6b76bc3d4a6f072142
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: <mesa-stable@lists.freedesktop.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
(cherry picked from commit 4143245c23c25a8b81c4ab6ca3d9211593edf542)
src/compiler/Android.glsl.mk