From 825fa2873f2d5c35cea88c31e5baafc978baaec0 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sun, 20 Jul 2014 21:12:18 +0100 Subject: [PATCH] android: egl/main: fixup the nouveau build For a while the nouveau pipe driver has been a static library and it has been using STL for even longer. Correct add the link and cleanup the gallium_DRIVERS. Cc: "10.1 10.2" Signed-off-by: Emil Velikov --- src/egl/main/Android.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/egl/main/Android.mk b/src/egl/main/Android.mk index 50d617df1dd..4d1a21d9f4a 100644 --- a/src/egl/main/Android.mk +++ b/src/egl/main/Android.mk @@ -94,13 +94,9 @@ endif # nouveau ifneq ($(filter nouveau, $(MESA_GPU_DRIVERS)),) -gallium_DRIVERS += \ - libmesa_winsys_nouveau \ - libmesa_pipe_nvfx \ - libmesa_pipe_nv50 \ - libmesa_pipe_nvc0 \ - libmesa_pipe_nouveau +gallium_DRIVERS += libmesa_winsys_nouveau libmesa_pipe_nouveau LOCAL_SHARED_LIBRARIES += libdrm_nouveau +LOCAL_SHARED_LIBRARIES += libstlport endif # r300g/r600g/radeonsi -- 2.30.2