summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaulo Sergio Travaglia <pstglia@gmail.com>2014-07-20 21:53:56 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2014-08-25 23:34:29 +0100
commit6601260464cf0a95da784f8ac8cf29d95b2b253c (patch)
treedfe20785eddebadd768585036e48835f1e8fb6d3 /src
parenta3eb6989ade803dd90a562f12766ed7e535d9876 (diff)
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" <mesa-stable@lists.freedesktop.org> [Emil Velikov] Split up and add commit message. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> (cherry picked from commit aae453afe8516cea330b65998741b8809e7ea7f2)
Diffstat (limited to 'src')
-rw-r--r--src/egl/main/Android.mk13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/egl/main/Android.mk b/src/egl/main/Android.mk
index 24294183ba3..75d1a47ba5c 100644
--- a/src/egl/main/Android.mk
+++ b/src/egl/main/Android.mk
@@ -117,16 +117,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)),)