Android: push driver build details to driver makefiles

[mesa.git] / src / egl / Android.mk

diff --git a/src/egl/Android.mk b/src/egl/Android.mk
index a122c1d971a397bbaed89e324b026ffaf1ec62da..00553226773e9ba8be87e495be88c9cbf2637d0d 100644 (file)
--- a/src/egl/Android.mk
+++ b/src/egl/Android.mk
@@ -58,16 +58,16 @@ LOCAL_SHARED_LIBRARIES := \
        libgralloc_drm \
        libsync
 
-ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
-# require i915_dri and/or i965_dri
-LOCAL_REQUIRED_MODULES += \
-       $(addsuffix _dri, $(filter i915 i965, $(MESA_GPU_DRIVERS)))
-endif # MESA_BUILD_CLASSIC
-
-ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
+# This controls enabling building of driver libraries
+ifneq ($(HAVE_I915_DRI),)
+LOCAL_REQUIRED_MODULES += i915_dri
+endif
+ifneq ($(HAVE_I965_DRI),)
+LOCAL_REQUIRED_MODULES += i965_dri
+endif
+ifneq ($(MESA_BUILD_GALLIUM),)
 LOCAL_REQUIRED_MODULES += gallium_dri
-endif # MESA_BUILD_GALLIUM
-
+endif
 
 LOCAL_MODULE := libGLES_mesa
 LOCAL_MODULE_RELATIVE_PATH := egl