OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: fix build ordering of subdirectories

Browse Source 
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 <robh@kernel.org>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
Rob Herring
2016-04-28 14:02:01 -05:00
committed by Emil Velikov
parent 595d56cc86
commit dbbf7a8e61
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Android.mk
View File

@@ -96,10 +96,12 @@ SUBDIRS := \
src/egl \ src/egl \
src/mesa/drivers/dri src/mesa/drivers/dri
INC_DIRS := $(call all-named-subdir-makefiles,$(SUBDIRS))
ifeq ($(strip $(MESA_BUILD_GALLIUM)),true) ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
SUBDIRS += src/gallium INC_DIRS += $(call all-named-subdir-makefiles,src/gallium)
endif endif
include $(call all-named-subdir-makefiles,$(SUBDIRS)) include $(INC_DIRS)
endif endif