vk/compiler: Add an index_count to the bind map and check for OOB

[mesa.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index b50a8e0712e15a43856f092131829bd90cbe9b5b..b19419ba7c2af110eeeb72924c9be128c834914e 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -34,11 +34,17 @@ MESA_TOP := $(call my-dir)
 MESA_ANDROID_MAJOR_VERSION := $(word 1, $(subst ., , $(PLATFORM_VERSION)))
 MESA_ANDROID_MINOR_VERSION := $(word 2, $(subst ., , $(PLATFORM_VERSION)))
 MESA_ANDROID_VERSION := $(MESA_ANDROID_MAJOR_VERSION).$(MESA_ANDROID_MINOR_VERSION)
+ifeq ($(filter 1 2 3 4,$(MESA_ANDROID_MAJOR_VERSION)),)
+MESA_LOLLIPOP_BUILD := true
+else
+define local-generated-sources-dir
+$(call local-intermediates-dir)
+endef
+endif
 
 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
@@ -82,6 +88,7 @@ SUBDIRS := \
        src/mapi \
        src/glsl \
        src/mesa \
+       src/util \
        src/egl/main
 
 ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
@@ -94,7 +101,6 @@ ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
 SUBDIRS += src/gallium
 endif
 
-mkfiles := $(patsubst %,$(MESA_TOP)/%/Android.mk,$(SUBDIRS))
-include $(mkfiles)
+include $(call all-named-subdir-makefiles,$(SUBDIRS))
 
 endif