3 files changed, 19 insertions, 3 deletions
diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c
index 67f799c..30ecefe 100644
--- a/src/egl/drivers/dri2/platform_android.c
+++ b/src/egl/drivers/dri2/platform_android.c
@@ -30,7 +30,10 @@
 #include <errno.h>
 #include <dlfcn.h>
 #include <fcntl.h>
+
+#ifdef HAVE_LIBDRM
 #include <xf86drm.h>
+#endif
 
 #if ANDROID_VERSION >= 0x402
 #include <sync/sync.h>
@@ -538,7 +541,11 @@ droid_create_image_from_prime_fd(_EGLDisplay *disp, _EGLContext *ctx,
          EGL_NONE, 0
       };
 
+#ifdef HAVE_LIBDRM
       return dri2_create_image_dma_buf(disp, ctx, NULL, attr_list_yv12);
+#else
+      return NULL;
+#endif
    }
 
    const EGLint attr_list[] = {
@@ -551,7 +558,11 @@ droid_create_image_from_prime_fd(_EGLDisplay *disp, _EGLContext *ctx,
       EGL_NONE, 0
    };
 
+#ifdef HAVE_LIBDRM
    return dri2_create_image_dma_buf(disp, ctx, NULL, attr_list);
+#else
+   return NULL;
+#endif
 }
 
 static _EGLImage *
@@ -1216,7 +1227,11 @@ dri2_initialize_android_drm(_EGLDriver *drv, _EGLDisplay *dpy)
       goto cleanup_driver_name;
    }
 
+#ifdef HAVE_LIBDRM
    dri2_dpy->is_render_node = drmGetNodeTypeFromFd(dri2_dpy->fd) == DRM_NODE_RENDER;
+#else
+   dri2_dpy->is_render_node = false;
+#endif
 
    /* render nodes cannot use Gem names, and thus do not support
     * the __DRI_DRI2_LOADER extension */
diff --git a/src/gallium/state_trackers/dri/Android.mk b/src/gallium/state_trackers/dri/Android.mk
index 4bdd136..bec13d5 100644
--- a/src/gallium/state_trackers/dri/Android.mk
+++ b/src/gallium/state_trackers/dri/Android.mk
@@ -42,11 +42,10 @@ LOCAL_STATIC_LIBRARIES := \
 
 ifneq ($(filter swrast,$(MESA_GPU_DRIVERS)),)
 LOCAL_SRC_FILES += $(drisw_SOURCES)
+LOCAL_SHARED_LIBRARIES := libdrm
 endif
 
-ifneq ($(filter-out swrast,$(MESA_GPU_DRIVERS)),)
 LOCAL_SRC_FILES += $(dri2_SOURCES)
-endif
 
 LOCAL_MODULE := libmesa_st_dri
 
diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk
index 18aefe3..f4b5fef 100644
--- a/src/gallium/targets/dri/Android.mk
+++ b/src/gallium/targets/dri/Android.mk
@@ -125,7 +125,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
 
 
 ifeq ($(MESA_ENABLE_LLVM),true)
-LOCAL_STATIC_LIBRARIES := libelf libz
+LOCAL_STATIC_LIBRARIES := \
+	libLLVMExecutionEngine \
+	libelf libz
 LOCAL_LDLIBS += $(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-lgcc)
 endif