X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Android.mk;h=914854c27d633cddd850ddf1dcca3720ffe740cd;hb=c359880d8be41628128ea699676643f4dd426047;hp=b03196ae3c5b453e2d3a3a0190ff68a8759cff29;hpb=c9b21d986e6421d57c429f5ba8ca1fc8868e76dc;p=mesa.git

diff --git a/Android.mk b/Android.mk
index b03196ae3c5..914854c27d6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,32 +23,65 @@
 
 # BOARD_GPU_DRIVERS should be defined.  The valid values are
 #
-#   classic drivers:
-#   gallium drivers: swrast
+#   classic drivers: i915 i965
+#   gallium drivers: swrast freedreno i915g nouveau pl111 r300g r600g radeonsi vc4 virgl vmwgfx etnaviv imx
 #
-# The main target is libGLES_mesa.  There is no classic drivers yet.
+# 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.
 
 MESA_TOP := $(call my-dir)
-MESA_COMMON_MK := $(MESA_TOP)/Android.common.mk
-MESA_PYTHON2 := python
 
-DRM_TOP := external/drm
-DRM_GRALLOC_TOP := hardware/drm_gralloc
+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
 
-classic_drivers :=
-gallium_drivers := swrast
+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_GPU_DRIVERS := $(BOARD_GPU_DRIVERS)
+MESA_COMMON_MK := $(MESA_TOP)/Android.common.mk
+MESA_PYTHON2 := python
 
-# warn about invalid drivers
-invalid_drivers := $(filter-out \
-	$(classic_drivers) $(gallium_drivers), $(MESA_GPU_DRIVERS))
-ifneq ($(invalid_drivers),)
-$(warning invalid GPU drivers: $(invalid_drivers))
-# tidy up
-MESA_GPU_DRIVERS := $(filter-out $(invalid_drivers), $(MESA_GPU_DRIVERS))
+# Lists to convert driver names to boolean variables
+# in form of <driver name>.<boolean make variable>
+classic_drivers := i915.HAVE_I915_DRI i965.HAVE_I965_DRI
+gallium_drivers := \
+	swrast.HAVE_GALLIUM_SOFTPIPE \
+	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 \
+	etnaviv.HAVE_GALLIUM_ETNAVIV \
+	imx.HAVE_GALLIUM_IMX
+
+ifeq ($(BOARD_GPU_DRIVERS),all)
+MESA_BUILD_CLASSIC := $(filter HAVE_%, $(subst ., , $(classic_drivers)))
+MESA_BUILD_GALLIUM := $(filter HAVE_%, $(subst ., , $(gallium_drivers)))
+else
+# Warn if we have any invalid driver names
+$(foreach d, $(BOARD_GPU_DRIVERS), \
+	$(if $(findstring $(d).,$(classic_drivers) $(gallium_drivers)), \
+		, \
+		$(warning invalid GPU driver: $(d)) \
+	) \
+)
+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
+ifeq ($(filter x86%,$(TARGET_ARCH)),)
+	MESA_BUILD_CLASSIC :=
 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
@@ -56,36 +89,39 @@ else
 MESA_ENABLE_ASM := false
 endif
 
-ifneq ($(filter $(classic_drivers), $(MESA_GPU_DRIVERS)),)
-MESA_BUILD_CLASSIC := true
-else
-MESA_BUILD_CLASSIC := false
+ifneq ($(filter true, $(HAVE_GALLIUM_RADEONSI)),)
+MESA_ENABLE_LLVM := true
 endif
 
-ifneq ($(filter $(gallium_drivers), $(MESA_GPU_DRIVERS)),)
-MESA_BUILD_GALLIUM := true
-else
-MESA_BUILD_GALLIUM := false
-endif
-
-ifneq ($(strip $(MESA_GPU_DRIVERS)),)
-
-# ---------------------------------------
-# Build libGLES_mesa
-# ---------------------------------------
-
-LOCAL_PATH := $(MESA_TOP)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES :=
-LOCAL_CFLAGS :=
-LOCAL_C_INCLUDES :=
-
-LOCAL_MODULE := libGLES_mesa
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl
-
-include $(MESA_COMMON_MK)
-include $(BUILD_SHARED_LIBRARY)
-
-endif # MESA_GPU_DRIVERS
+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)) \
+  $(if $(filter 7,$(MESA_ANDROID_MAJOR_VERSION)), \
+    $(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)) \
+  $(if $(filter P,$(MESA_ANDROID_MAJOR_VERSION)), \
+    $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0309 -DMESA_LLVM_VERSION_PATCH=0)) \
+  $(eval LOCAL_SHARED_LIBRARIES += libLLVM)
+endef
+
+# add subdirectories
+SUBDIRS := \
+	src/gbm \
+	src/loader \
+	src/mapi \
+	src/compiler \
+	src/mesa \
+	src/util \
+	src/egl \
+	src/amd \
+	src/broadcom \
+	src/intel \
+	src/mesa/drivers/dri \
+	src/vulkan
+
+INC_DIRS := $(call all-named-subdir-makefiles,$(SUBDIRS))
+INC_DIRS += $(call all-named-subdir-makefiles,src/gallium)
+include $(INC_DIRS)