Mesa (master): Android: generate symlinks for all enabled gallium drivers

Emil Velikov evelikov at kemper.freedesktop.org
Wed Jul 5 14:14:13 UTC 2017


Module: Mesa
Branch: master
Commit: b7ee56b5991e02bf4bff4ca702182bf37e59aa07
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b7ee56b5991e02bf4bff4ca702182bf37e59aa07

Author: Mauro Rossi <issor.oruam at gmail.com>
Date:   Sat Jul  1 17:52:49 2017 +0200

Android: generate symlinks for all enabled gallium drivers

Current post install command relies on GALLIUM_TARGET_DRIVERS variable,
however variable needs to be initialized in src/gallium/Android.mk
in order that all enabled gallium drivers symlinks are correctly generated.

At the moment due to sorting of INC_DIRS and variable set with svga (vmwgfx)
only vmwgfx_dri.so and virtio_gpu_dri.so symlinks are generated.

Fixes: a3d98ca62f ("Android: use symlinks for driver loading")
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

---

 src/gallium/Android.mk              | 1 +
 src/gallium/drivers/svga/Android.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/Android.mk b/src/gallium/Android.mk
index 8743dd6d26..8be365a550 100644
--- a/src/gallium/Android.mk
+++ b/src/gallium/Android.mk
@@ -25,6 +25,7 @@
 
 GALLIUM_TOP := $(call my-dir)
 GALLIUM_COMMON_MK := $(GALLIUM_TOP)/Android.common.mk
+GALLIUM_TARGET_DRIVERS :=
 
 SUBDIRS := auxiliary
 SUBDIRS += auxiliary/pipe-loader
diff --git a/src/gallium/drivers/svga/Android.mk b/src/gallium/drivers/svga/Android.mk
index 154cfc4c59..edb69bf2bf 100644
--- a/src/gallium/drivers/svga/Android.mk
+++ b/src/gallium/drivers/svga/Android.mk
@@ -40,6 +40,6 @@ include $(GALLIUM_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 ifneq ($(HAVE_GALLIUM_VMWGFX),)
-GALLIUM_TARGET_DRIVERS := vmwgfx
+GALLIUM_TARGET_DRIVERS += vmwgfx
 $(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_svga)
 endif




More information about the mesa-commit mailing list