configure.ac: split the wayland client/server confusion

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

diff --git a/src/egl/Android.mk b/src/egl/Android.mk
index 5dce6c615597453a020478b28c2058124ed4f41f..d7a6e88918f6fd169807d18099f9ac40a03b318a 100644 (file)
--- a/src/egl/Android.mk
+++ b/src/egl/Android.mk
@@ -45,9 +45,10 @@ LOCAL_CFLAGS := \
 
 LOCAL_C_INCLUDES := \
        $(MESA_TOP)/src/egl/main \
-       $(MESA_TOP)/src/egl/drivers/dri2 \
+       $(MESA_TOP)/src/egl/drivers/dri2
 
 LOCAL_STATIC_LIBRARIES := \
+       libmesa_util \
        libmesa_loader
 
 LOCAL_SHARED_LIBRARIES := \
@@ -56,34 +57,21 @@ LOCAL_SHARED_LIBRARIES := \
        liblog \
        libcutils \
        libgralloc_drm \
+       libsync
 
-ifeq ($(shell echo "$(MESA_ANDROID_VERSION) >= 4.2" | bc),1)
-LOCAL_SHARED_LIBRARIES += libsync
+# This controls enabling building of driver libraries
+ifneq ($(HAVE_I915_DRI),)
+LOCAL_REQUIRED_MODULES += i915_dri
 endif
-
-# add libdrm if there are hardware drivers
-ifneq ($(filter-out swrast,$(MESA_GPU_DRIVERS)),)
-LOCAL_CFLAGS += -DHAVE_LIBDRM
-LOCAL_SHARED_LIBRARIES += libdrm
+ifneq ($(HAVE_I965_DRI),)
+LOCAL_REQUIRED_MODULES += i965_dri
 endif
-
-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)
+ifneq ($(MESA_BUILD_GALLIUM),)
 LOCAL_REQUIRED_MODULES += gallium_dri
-endif # MESA_BUILD_GALLIUM
-
+endif
 
 LOCAL_MODULE := libGLES_mesa
-ifeq ($(MESA_LOLLIPOP_BUILD),true)
 LOCAL_MODULE_RELATIVE_PATH := egl
-else
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl
-endif
 
 include $(MESA_COMMON_MK)
 include $(BUILD_SHARED_LIBRARY)