summaryrefslogtreecommitdiffstats
path: root/src/gallium/Android.mk
diff options
context:
space:
mode:
authorRob Herring <[email protected]>2017-10-10 17:01:29 -0500
committerRob Herring <[email protected]>2017-10-10 21:37:19 -0500
commite5e93c727f23d0c87e1edf04705d0d0342290536 (patch)
treeae53e81505d3ac2e4ff8617cee7d788b8543a027 /src/gallium/Android.mk
parentc3f75d483c72d4ceb22d32561f8d08bf3e0c8a0b (diff)
Android: fix build break from r600/radeon split
Commit 06bfb2d28f7a ("r600: fork and import gallium/radeon") broke the Android build: external/mesa3d/src/gallium/drivers/radeon/r600_pipe_common.c:43:10: fatal error: 'llvm-c/TargetMachine.h' file not found ^~~~~~~~~~~~~~~~~~~~~~~~ Update the Android makefiles so that drivers/radeon is only built when radeonsi (and therefore LLVM) is enabled. Fixes: 06bfb2d28f7a (r600: fork and import gallium/radeon) Acked-by: Marek Olšák <[email protected]> Signed-off-by: Rob Herring <[email protected]>
Diffstat (limited to 'src/gallium/Android.mk')
-rw-r--r--src/gallium/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/Android.mk b/src/gallium/Android.mk
index 8be365a5504..6f93665365a 100644
--- a/src/gallium/Android.mk
+++ b/src/gallium/Android.mk
@@ -40,7 +40,7 @@ SUBDIRS += winsys/i915/drm drivers/i915
SUBDIRS += winsys/nouveau/drm drivers/nouveau
SUBDIRS += winsys/pl111/drm drivers/pl111
SUBDIRS += winsys/radeon/drm drivers/r300
-SUBDIRS += winsys/radeon/drm drivers/r600 drivers/radeon
+SUBDIRS += winsys/radeon/drm drivers/r600
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