Different versions of make behave differently in whether $(wildcard) sorts the results or not. The Android build now explicitly sorts all-named-subdir-makefiles which breaks the build because src/gallium must be included after src/mesa/drivers/dri.
The Android build system doesn't support doing "include $(call all-named-subdir-makefiles,...)" twice, so rework things by generating the included makefile list and including them in 2 steps. Signed-off-by: Rob Herring <[email protected]> --- Android.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index aa4350f..bd42bc6 100644 --- a/Android.mk +++ b/Android.mk @@ -96,10 +96,12 @@ SUBDIRS := \ 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 -- 2.7.4 _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
