util/disk_cache: don't deadlock on premature EOF

[mesa.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index b03196ae3c5b453e2d3a3a0190ff68a8759cff29..fdbf22fe643aec953feff3d9cce75efd36977a44 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -23,22 +23,27 @@
 
 # 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 r300g r600g radeonsi vc4 virgl vmwgfx
 #
-# 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_ANDROID_MAJOR_VERSION := $(word 1, $(subst ., , $(PLATFORM_VERSION)))
+
+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_COMMON_MK := $(MESA_TOP)/Android.common.mk
 MESA_PYTHON2 := python
 
-DRM_TOP := external/drm
-DRM_GRALLOC_TOP := hardware/drm_gralloc
+classic_drivers := i915 i965
+gallium_drivers := swrast freedreno i915g nouveau r300g r600g radeonsi vmwgfx vc4 virgl
 
-classic_drivers :=
-gallium_drivers := swrast
-
-MESA_GPU_DRIVERS := $(BOARD_GPU_DRIVERS)
+MESA_GPU_DRIVERS := $(strip $(BOARD_GPU_DRIVERS))
 
 # warn about invalid drivers
 invalid_drivers := $(filter-out \
@@ -68,24 +73,30 @@ else
 MESA_BUILD_GALLIUM := false
 endif
 
-ifneq ($(strip $(MESA_GPU_DRIVERS)),)
-
-# ---------------------------------------
-# Build libGLES_mesa
-# ---------------------------------------
+MESA_ENABLE_LLVM := $(if $(filter radeonsi,$(MESA_GPU_DRIVERS)),true,false)
 
-LOCAL_PATH := $(MESA_TOP)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES :=
-LOCAL_CFLAGS :=
-LOCAL_C_INCLUDES :=
+# add subdirectories
+ifneq ($(strip $(MESA_GPU_DRIVERS)),)
 
-LOCAL_MODULE := libGLES_mesa
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl
+SUBDIRS := \
+       src/gbm \
+       src/loader \
+       src/mapi \
+       src/compiler \
+       src/mesa \
+       src/util \
+       src/egl \
+       src/amd \
+       src/intel \
+       src/mesa/drivers/dri \
+       src/vulkan
+
+INC_DIRS := $(call all-named-subdir-makefiles,$(SUBDIRS))
+
+ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
+INC_DIRS += $(call all-named-subdir-makefiles,src/gallium)
+endif
 
-include $(MESA_COMMON_MK)
-include $(BUILD_SHARED_LIBRARY)
+include $(INC_DIRS)
 
-endif # MESA_GPU_DRIVERS
+endif