egl/drm: Don't "fall back" to /dev/dri/card0 if the first open fails

[mesa.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index de37f4600f30fb2837ae5f8a8bddc36beba32210..e03eb71612322095e074ec76127f99f10a6b263e 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -24,7 +24,7 @@
 # BOARD_GPU_DRIVERS should be defined.  The valid values are
 #
 #   classic drivers: i915 i965
-#   gallium drivers: swrast freedreno i915g nouveau r300g r600g radeonsi vc4 virgl vmwgfx
+#   gallium drivers: swrast freedreno i915g nouveau pl111 r300g r600g radeonsi vc4 virgl vmwgfx etnaviv imx
 #
 # The main target is libGLES_mesa.  For each classic driver enabled, a DRI
 # module will also be built.  DRI modules will be loaded by libGLES_mesa.
@@ -51,12 +51,15 @@ gallium_drivers := \
        freedreno.HAVE_GALLIUM_FREEDRENO \
        i915g.HAVE_GALLIUM_I915 \
        nouveau.HAVE_GALLIUM_NOUVEAU \
+       pl111.HAVE_GALLIUM_PL111 \
        r300g.HAVE_GALLIUM_R300 \
        r600g.HAVE_GALLIUM_R600 \
        radeonsi.HAVE_GALLIUM_RADEONSI \
        vmwgfx.HAVE_GALLIUM_VMWGFX \
        vc4.HAVE_GALLIUM_VC4 \
-       virgl.HAVE_GALLIUM_VIRGL
+       virgl.HAVE_GALLIUM_VIRGL \
+       etnaviv.HAVE_GALLIUM_ETNAVIV \
+       imx.HAVE_GALLIUM_IMX
 
 ifeq ($(BOARD_GPU_DRIVERS),all)
 MESA_BUILD_CLASSIC := $(filter HAVE_%, $(subst ., , $(classic_drivers)))
@@ -89,16 +92,12 @@ define mesa-build-with-llvm
   $(if $(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5), \
     $(warning Unsupported LLVM version in Android $(MESA_ANDROID_MAJOR_VERSION)),) \
   $(if $(filter 6,$(MESA_ANDROID_MAJOR_VERSION)), \
-    $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0307 -DMESA_LLVM_VERSION_PATCH=0) \
-    $(eval LOCAL_STATIC_LIBRARIES += libLLVMCore) \
-    $(eval LOCAL_C_INCLUDES += external/llvm/include external/llvm/device/include),) \
+    $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0307 -DMESA_LLVM_VERSION_PATCH=0)) \
   $(if $(filter 7,$(MESA_ANDROID_MAJOR_VERSION)), \
-    $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0308 -DMESA_LLVM_VERSION_PATCH=0) \
-    $(eval LOCAL_STATIC_LIBRARIES += libLLVMCore) \
-    $(eval LOCAL_C_INCLUDES += external/llvm/include external/llvm/device/include),) \
-  $(if $(filter O,$(MESA_ANDROID_MAJOR_VERSION)), \
-    $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0309 -DMESA_LLVM_VERSION_PATCH=0) \
-    $(eval LOCAL_HEADER_LIBRARIES += llvm-headers),)
+    $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0308 -DMESA_LLVM_VERSION_PATCH=0)) \
+  $(if $(filter 8,$(MESA_ANDROID_MAJOR_VERSION)), \
+    $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0309 -DMESA_LLVM_VERSION_PATCH=0)) \
+  $(eval LOCAL_SHARED_LIBRARIES += libLLVM)
 endef
 
 # add subdirectories
@@ -111,6 +110,7 @@ SUBDIRS := \
        src/util \
        src/egl \
        src/amd \
+       src/broadcom \
        src/intel \
        src/mesa/drivers/dri \
        src/vulkan