Android: kill off {MESA_}ANDROID_VERSION defines aka Android 4.1 and older

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

diff --git a/src/egl/Android.mk b/src/egl/Android.mk
index 516b53c6255ff04cb7edba57485858f0b033e53d..56d8859dd5f285e1c0feec8d796a6bad330046da 100644 (file)
--- a/src/egl/Android.mk
+++ b/src/egl/Android.mk
@@ -43,18 +43,9 @@ LOCAL_CFLAGS := \
        -D_EGL_BUILT_IN_DRIVER_DRI2 \
        -DHAVE_ANDROID_PLATFORM
 
-ifeq ($(MESA_LOLLIPOP_BUILD),true)
-LOCAL_CFLAGS_arm := -DDEFAULT_DRIVER_DIR=\"/system/lib/dri\"
-LOCAL_CFLAGS_x86 := -DDEFAULT_DRIVER_DIR=\"/system/lib/dri\"
-LOCAL_CFLAGS_x86_64 := -DDEFAULT_DRIVER_DIR=\"/system/lib64/dri\"
-else
-LOCAL_CFLAGS += -DDEFAULT_DRIVER_DIR=\"/system/lib/dri\"
-endif
-
 LOCAL_C_INCLUDES := \
-       $(DRM_GRALLOC_TOP) \
        $(MESA_TOP)/src/egl/main \
-       $(MESA_TOP)/src/egl/drivers/dri2 \
+       $(MESA_TOP)/src/egl/drivers/dri2
 
 LOCAL_STATIC_LIBRARIES := \
        libmesa_loader
@@ -65,16 +56,7 @@ LOCAL_SHARED_LIBRARIES := \
        liblog \
        libcutils \
        libgralloc_drm \
-
-ifeq ($(shell echo "$(MESA_ANDROID_VERSION) >= 4.2" | bc),1)
-LOCAL_SHARED_LIBRARIES += libsync
-endif
-
-# add libdrm if there are hardware drivers
-ifneq ($(filter-out swrast,$(MESA_GPU_DRIVERS)),)
-LOCAL_CFLAGS += -DHAVE_LIBDRM
-LOCAL_SHARED_LIBRARIES += libdrm
-endif
+       libsync
 
 ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
 # require i915_dri and/or i965_dri