android: intel: Flatten the makefile structure

[mesa.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index aa4350f0a776c1cac9c6e0ffbebc255908eb5ed7..dfc45c42638fd0dbcb2a3aabe22a9d9a76f1a688 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -88,18 +88,22 @@ MESA_ENABLE_LLVM := $(if $(filter radeonsi,$(MESA_GPU_DRIVERS)),true,false)
 ifneq ($(strip $(MESA_GPU_DRIVERS)),)
 
 SUBDIRS := \
+       src/gbm \
        src/loader \
        src/mapi \
        src/compiler \
        src/mesa \
        src/util \
        src/egl \
+       src/intel \
        src/mesa/drivers/dri
 
+INC_DIRS := $(call all-named-subdir-makefiles,$(SUBDIRS))
+
 ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
-SUBDIRS += src/gallium
+INC_DIRS += $(call all-named-subdir-makefiles,src/gallium)
 endif
 
-include $(call all-named-subdir-makefiles,$(SUBDIRS))
+include $(INC_DIRS)
 
 endif