From 3f097396a1642bb7033002d0bdd37e194afce06a Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Wed, 3 May 2017 14:35:20 -0500 Subject: Android: push driver build details to driver makefiles src/gallium/targets/dri/Android.mk contains lots of conditional for individual drivers. Let's move these details into the individual driver makefiles. In the process, align the make driver conditionals with automake (i.e. HAVE_GALLIUM_*). Signed-off-by: Rob Herring [Emil Velikov: add the radeon winsys for radeonsi] Signed-off-by: Emil Velikov --- src/gallium/drivers/r300/Android.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/gallium/drivers/r300/Android.mk') diff --git a/src/gallium/drivers/r300/Android.mk b/src/gallium/drivers/r300/Android.mk index e2939ac4043..0c89cdbb147 100644 --- a/src/gallium/drivers/r300/Android.mk +++ b/src/gallium/drivers/r300/Android.mk @@ -41,3 +41,7 @@ LOCAL_MODULE := libmesa_pipe_r300 include $(GALLIUM_COMMON_MK) include $(BUILD_STATIC_LIBRARY) +ifneq ($(HAVE_GALLIUM_R300),) +$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_radeon) +$(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES)) +endif -- cgit v1.2.3