diff options
| author | Rob Herring <[email protected]> | 2017-05-03 14:35:20 -0500 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-05-11 13:52:21 +0100 |
| commit | 3f097396a1642bb7033002d0bdd37e194afce06a (patch) | |
| tree | 8a4bd04f538b8622325f18b9b26053256a44da63 /src/gallium/Android.mk | |
| parent | 2a2dabe1c330fea311505b453de58ddcd5488fcc (diff) | |
Android: push driver build details to driver makefiles
src/gallium/targets/dri/Android.mk contains lots of conditional for
individual drivers. Let's move these details into the individual driver
makefiles.
In the process, align the make driver conditionals with automake
(i.e. HAVE_GALLIUM_*).
Signed-off-by: Rob Herring <[email protected]>
[Emil Velikov: add the radeon winsys for radeonsi]
Signed-off-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium/Android.mk')
| -rw-r--r-- | src/gallium/Android.mk | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/gallium/Android.mk b/src/gallium/Android.mk index 7c6bda68d59..09155791273 100644 --- a/src/gallium/Android.mk +++ b/src/gallium/Android.mk @@ -37,12 +37,17 @@ SUBDIRS += winsys/sw/dri drivers/softpipe SUBDIRS += winsys/freedreno/drm drivers/freedreno SUBDIRS += winsys/i915/drm drivers/i915 SUBDIRS += winsys/nouveau/drm drivers/nouveau -SUBDIRS += drivers/r300 drivers/r600 drivers/radeon drivers/radeonsi -SUBDIRS += winsys/amdgpu/drm winsys/radeon/drm +SUBDIRS += winsys/radeon/drm drivers/r300 +SUBDIRS += winsys/radeon/drm drivers/r600 drivers/radeon +SUBDIRS += winsys/radeon/drm winsys/amdgpu/drm drivers/radeonsi drivers/radeon SUBDIRS += winsys/vc4/drm drivers/vc4 SUBDIRS += winsys/virgl/drm winsys/virgl/vtest drivers/virgl SUBDIRS += winsys/svga/drm drivers/svga +SUBDIRS += state_trackers/dri -SUBDIRS += state_trackers/dri targets/dri +# sort to eliminate any duplicates +INC_DIRS := $(call all-named-subdir-makefiles,$(sort $(SUBDIRS))) +# targets/dri must be included last +INC_DIRS += $(call all-named-subdir-makefiles,targets/dri) -include $(call all-named-subdir-makefiles,$(SUBDIRS)) +include $(INC_DIRS) |