diff options
| author | Rob Herring <[email protected]> | 2016-04-28 14:02:01 -0500 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-05-01 12:31:28 +0100 |
| commit | dbbf7a8e618f06f59abbdc4c5be605a08886ed6a (patch) | |
| tree | 837f054d01b1ed68454f32b84eb157f97c7bbea7 | |
| parent | 595d56cc866638f371626cc1d0137a6a54a7d0f8 (diff) | |
Android: fix build ordering of subdirectories
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]>
Reviewed-by: Emil Velikov <[email protected]>
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index aa4350f0a77..bd42bc6f4a9 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 |