egl/x11: don't crash if dri2_dpy->conn is NULL

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

diff --git a/src/egl/Android.mk b/src/egl/Android.mk
index ebd67af34ccdacfdeab17fafdad8e5c125bb6cd5..bfd56a744df8ff4324668662850cc8a8b7d0730b 100644 (file)
--- a/src/egl/Android.mk
+++ b/src/egl/Android.mk
@@ -43,14 +43,6 @@ 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 := \
        $(MESA_TOP)/src/egl/main \
        $(MESA_TOP)/src/egl/drivers/dri2 \
@@ -69,12 +61,6 @@ 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
-
 ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
 # require i915_dri and/or i965_dri
 LOCAL_REQUIRED_MODULES += \