OSDN Git Service

android: mesa/st: fix libcxx/stlport dependency (v2)
authorMauro Rossi <issor.oruam@gmail.com>
Mon, 2 Jan 2017 13:42:25 +0000 (14:42 +0100)
committerMauro Rossi <issor.oruam@gmail.com>
Mon, 20 Mar 2017 23:15:04 +0000 (00:15 +0100)
commit8357a6392d8b634acded8256208a248f13a0bc96
tree5b41e5e62239c423aa6b969d9d965c2665b7e4c8
parentf8b375ac8cd46c788bfdc23559401782dfa98574
android: mesa/st: fix libcxx/stlport dependency (v2)

Fixes the following building error with both libcxx and stlport:

target  C++: libmesa_st_mesa <= external/mesa/src/mesa/state_tracker/st_glsl_to_nir.cpp
external/mesa/src/mesa/state_tracker/st_glsl_to_tgsi.cpp:58:21: fatal error: algorithm: No such file or directory
compilation terminated.
build/core/binary.mk:432: recipe for target 'out/target/product/x86/obj/STATIC_LIBRARIES/libmesa_st_mesa_intermediates/state_tracker/st_glsl_to_tgsi.o' failed
make: *** [out/target/product/x86/obj/STATIC_LIBRARIES/libmesa_st_mesa_intermediates/state_tracker/st_glsl_to_tgsi.o] Error 1
make: *** Waiting for unfinished jobs....

(v1) was inspired by st/mesa part in Zhen Wu c278beb "android: fix building on lollipop"

(v2) Mauro: use 'LOCAL_C_INCLUDES += external/libcxx/include' and add stlport dependency for kitkat-x86
     Zhen: define LOCAL_CXX_STL := libc++
src/mesa/Android.libmesa_st_mesa.mk