summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMauro Rossi <[email protected]>2017-07-01 17:52:49 +0200
committerEmil Velikov <[email protected]>2017-07-05 15:10:42 +0100
commitb7ee56b5991e02bf4bff4ca702182bf37e59aa07 (patch)
treef55440ba68f348cb3eb1c1e382ce9ce2861fdae9 /src
parent79827f50e22b490f0c57658a88904c01b732237b (diff)
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 <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/Android.mk1
-rw-r--r--src/gallium/drivers/svga/Android.mk2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/Android.mk b/src/gallium/Android.mk
index 8743dd6d26b..8be365a5504 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 154cfc4c596..edb69bf2bfd 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