egl: drop unused _EGLDriver from WaitClient()

[mesa.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index e2d792d8e4c4cbf0338898331d4924e51a53d8f4..6181bbe8f31a8a4d706ee0846927bb06b1e1c404 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 kmsro r300g r600g radeonsi vc4 virgl vmwgfx etnaviv iris lima panfrost
 #
 # 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.
@@ -32,13 +32,23 @@
 MESA_TOP := $(call my-dir)
 
 MESA_ANDROID_MAJOR_VERSION := $(word 1, $(subst ., , $(PLATFORM_VERSION)))
+ifneq ($(filter 2 4, $(MESA_ANDROID_MAJOR_VERSION)),)
+$(error "Android 4.4 and earlier not supported")
+endif
 
 MESA_DRI_MODULE_REL_PATH := dri
 MESA_DRI_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/$(MESA_DRI_MODULE_REL_PATH)
 MESA_DRI_MODULE_UNSTRIPPED_PATH := $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/$(MESA_DRI_MODULE_REL_PATH)
+MESA_DRI_LDFLAGS := -Wl,--build-id=sha1
 
 MESA_COMMON_MK := $(MESA_TOP)/Android.common.mk
 MESA_PYTHON2 := python
+MESA_PYTHON3 := python3
+ifeq ($(filter 5 6 7 8 9 10, $(MESA_ANDROID_MAJOR_VERSION)),)
+MESA_LEX     := M4=$(M4) $(LEX)
+else
+MESA_LEX     := $(LEX)
+endif
 
 # Lists to convert driver names to boolean variables
 # in form of <driver name>.<boolean make variable>
@@ -48,12 +58,17 @@ gallium_drivers := \
        freedreno.HAVE_GALLIUM_FREEDRENO \
        i915g.HAVE_GALLIUM_I915 \
        nouveau.HAVE_GALLIUM_NOUVEAU \
+       kmsro.HAVE_GALLIUM_KMSRO \
        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 \
+       iris.HAVE_GALLIUM_IRIS \
+       lima.HAVE_GALLIUM_LIMA \
+       panfrost.HAVE_GALLIUM_PANFROST
 
 ifeq ($(BOARD_GPU_DRIVERS),all)
 MESA_BUILD_CLASSIC := $(filter HAVE_%, $(subst ., , $(classic_drivers)))
@@ -69,21 +84,27 @@ $(foreach d, $(BOARD_GPU_DRIVERS), \
 MESA_BUILD_CLASSIC := $(strip $(foreach d, $(BOARD_GPU_DRIVERS), $(patsubst $(d).%,%, $(filter $(d).%, $(classic_drivers)))))
 MESA_BUILD_GALLIUM := $(strip $(foreach d, $(BOARD_GPU_DRIVERS), $(patsubst $(d).%,%, $(filter $(d).%, $(gallium_drivers)))))
 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
+ifeq ($(filter x86%,$(TARGET_ARCH)),)
+       MESA_BUILD_CLASSIC :=
 endif
 
+$(foreach d, $(MESA_BUILD_CLASSIC) $(MESA_BUILD_GALLIUM), $(eval $(d) := true))
+
 ifneq ($(filter true, $(HAVE_GALLIUM_RADEONSI)),)
 MESA_ENABLE_LLVM := true
 endif
 
+define mesa-build-with-llvm
+  $(if $(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7), \
+    $(warning Unsupported LLVM version in Android $(MESA_ANDROID_MAJOR_VERSION)),) \
+  $(eval LOCAL_CFLAGS += -DLLVM_AVAILABLE -DMESA_LLVM_VERSION_STRING=\"3.9\") \
+  $(eval LOCAL_SHARED_LIBRARIES += libLLVM)
+endef
+
 # add subdirectories
 SUBDIRS := \
+       src/etnaviv \
+       src/freedreno \
        src/gbm \
        src/loader \
        src/mapi \
@@ -92,9 +113,11 @@ SUBDIRS := \
        src/util \
        src/egl \
        src/amd \
+       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)