Android: egl: add dependency on libnativewindow

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

diff --git a/src/egl/Android.mk b/src/egl/Android.mk
index a122c1d971a397bbaed89e324b026ffaf1ec62da..11818694f4f831c04433855d6a96ff475a9abb85 100644 (file)
--- a/src/egl/Android.mk
+++ b/src/egl/Android.mk
@@ -48,26 +48,32 @@ LOCAL_C_INCLUDES := \
        $(MESA_TOP)/src/egl/drivers/dri2
 
 LOCAL_STATIC_LIBRARIES := \
+       libmesa_util \
        libmesa_loader
 
 LOCAL_SHARED_LIBRARIES := \
        libdl \
+       libglapi \
        libhardware \
        liblog \
        libcutils \
        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 ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),)
+LOCAL_SHARED_LIBRARIES += libnativewindow
+endif
 
-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