X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Android.mk;h=6a5596bea062e72bdd6a3dd6b212b6a0ce4d9553;hb=06d8765bc09ecd8ff73fff424c8cfec645cb0ded;hp=908078a02cece1e75b0a3d4194e1c091c0b71891;hpb=1a882fd2ee84ae28a06cf07902dc4645d8ad4a6d;p=mesa.git

diff --git a/Android.mk b/Android.mk
index 908078a02ce..6a5596bea06 100644
--- 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,21 @@ 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/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