android: intel: Flatten the makefile structure

[mesa.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 908078a02cece1e75b0a3d4194e1c091c0b71891..dfc45c42638fd0dbcb2a3aabe22a9d9a76f1a688 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -42,6 +42,10 @@ $(call local-intermediates-dir)
 endef
 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_COMMON_MK := $(MESA_TOP)/Android.common.mk
 MESA_PYTHON2 := python
 
@@ -84,19 +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/glsl \
        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