From aae453afe8516cea330b65998741b8809e7ea7f2 Mon Sep 17 00:00:00 2001 From: Paulo Sergio Travaglia Date: Sun, 20 Jul 2014 21:53:56 +0100 Subject: android: egl/main: resolve radeon linking issues - link against libdrm_radeon - link the r600 driver against libstlport - linkin the newly added libmesa_pipe_radeon library required by r600 and radeonsi drivers v2: Include pipe_radeon after pipe_r600/radeonsi. Cc: "10.1 10.2" [Emil Velikov] Split up and add commit message. Signed-off-by: Emil Velikov --- src/egl/main/Android.mk | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/egl/main/Android.mk') diff --git a/src/egl/main/Android.mk b/src/egl/main/Android.mk index 4d1a21d9f4a..b134682f465 100644 --- a/src/egl/main/Android.mk +++ b/src/egl/main/Android.mk @@ -102,16 +102,21 @@ endif # r300g/r600g/radeonsi ifneq ($(filter r300g r600g radeonsi, $(MESA_GPU_DRIVERS)),) gallium_DRIVERS += libmesa_winsys_radeon +LOCAL_SHARED_LIBRARIES += libdrm_radeon ifneq ($(filter r300g, $(MESA_GPU_DRIVERS)),) gallium_DRIVERS += libmesa_pipe_r300 -endif +endif # r300g +ifneq ($(filter r600g radeonsi, $(MESA_GPU_DRIVERS)),) ifneq ($(filter r600g, $(MESA_GPU_DRIVERS)),) gallium_DRIVERS += libmesa_pipe_r600 -endif +LOCAL_SHARED_LIBRARIES += libstlport +endif # r600g ifneq ($(filter radeonsi, $(MESA_GPU_DRIVERS)),) gallium_DRIVERS += libmesa_pipe_radeonsi -endif -endif +endif # radeonsi +gallium_DRIVERS += libmesa_pipe_radeon +endif # r600g || radeonsi +endif # r300g || r600g || radeonsi # vmwgfx ifneq ($(filter vmwgfx, $(MESA_GPU_DRIVERS)),) -- cgit v1.2.3