etnaviv: Remove etna_bo_from_handle() prototype

[mesa.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 3b9a54058e0050e13bb9fc8fab3af06a12013fb0..76d26f9bd83043dfad624fd4887dac118fefaf59 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 kmsro r300g r600g radeonsi vc4 virgl vmwgfx etnaviv iris
+#   gallium drivers: swrast freedreno i915g nouveau kmsro r300g r600g radeonsi vc4 virgl vmwgfx etnaviv iris lima
 #
 # 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.
@@ -60,7 +60,8 @@ gallium_drivers := \
        vc4.HAVE_GALLIUM_VC4 \
        virgl.HAVE_GALLIUM_VIRGL \
        etnaviv.HAVE_GALLIUM_ETNAVIV \
-       iris.HAVE_GALLIUM_IRIS
+       iris.HAVE_GALLIUM_IRIS \
+       lima.HAVE_GALLIUM_LIMA
 
 ifeq ($(BOARD_GPU_DRIVERS),all)
 MESA_BUILD_CLASSIC := $(filter HAVE_%, $(subst ., , $(classic_drivers)))
@@ -82,13 +83,6 @@ endif
 
 $(foreach d, $(MESA_BUILD_CLASSIC) $(MESA_BUILD_GALLIUM), $(eval $(d) := true))
 
-# host and target must be the same arch to generate matypes.h
-ifeq ($(TARGET_ARCH),$(HOST_ARCH))
-MESA_ENABLE_ASM := true
-else
-MESA_ENABLE_ASM := false
-endif
-
 ifneq ($(filter true, $(HAVE_GALLIUM_RADEONSI)),)
 MESA_ENABLE_LLVM := true
 endif
@@ -109,6 +103,7 @@ endef
 
 # add subdirectories
 SUBDIRS := \
+       src/freedreno \
        src/gbm \
        src/loader \
        src/mapi \
@@ -120,7 +115,8 @@ SUBDIRS := \
        src/broadcom \
        src/intel \
        src/mesa/drivers/dri \
-       src/vulkan
+       src/vulkan \
+       src/panfrost \
 
 INC_DIRS := $(call all-named-subdir-makefiles,$(SUBDIRS))
 INC_DIRS += $(call all-named-subdir-makefiles,src/gallium)