[Mesa-stable] [android-x86-devel] [PATCH 2/3] android: libmesa_glsl: add a dependency on libmesa_nir static

[Rob Herring]

On Tue, May 31, 2016 at 9:20 AM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> On 30 May 2016 at 23:20, Mauro Rossi <issor.oruam at gmail.com> wrote:
>> 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 at lists.freedesktop.org>
>> ---
>>  src/compiler/Android.glsl.mk | 5 +++--
>>  1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/src/compiler/Android.glsl.mk b/src/compiler/Android.glsl.mk
>> index 5d2bc18..21c1065 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
>>
> IIRC I suggested adding the libmesa_nir, but somehow the include got merged.
>
> I'll push this in a second.

Seems the second has passed. ;)

I built against AOSP master.

Tested-by: Rob Herring <robh at kernel.org>