summaryrefslogtreecommitdiffstats
path: root/Android.common.mk
diff options
context:
space:
mode:
authorMauro Rossi <issor.oruam@gmail.com>2015-12-22 13:26:51 +0100
committerMauro Rossi <issor.oruam@gmail.com>2016-11-01 20:41:59 +0100
commit8f3d32ced7a3413a24a494e575949eebab5c85f6 (patch)
tree91dc0af65c60fb1cb8c1bccc98c4e348677ad9c9 /Android.common.mk
parent9278d180725cdf444dd65c580d1382ea26de64d0 (diff)
downloadexternal_mesa3d-8f3d32ced7a3413a24a494e575949eebab5c85f6.zip
external_mesa3d-8f3d32ced7a3413a24a494e575949eebab5c85f6.tar.gz
external_mesa3d-8f3d32ced7a3413a24a494e575949eebab5c85f6.tar.bz2
android: add support for LLVM 3.7.0 for marshmallow
The changes add support for LLVM 3.7.0 for marshmallow, while keeping support for LLVM 3.5.0 with lollipop. MESA_LLVM_VERSION_PATCH=0 is compatible with radeonsi build in lollipop-x86, since mesa 11.0 and newer do not check anymore for LLVM 3.5.2 This changes, combined with specific R600 patches for external/llvm, enable building gallium radeonsi driver in marshmallow-x86. The patch is applicable to 11.2.0devel, 11.1 and 11.0 branches.
Diffstat (limited to 'Android.common.mk')
-rw-r--r--Android.common.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.common.mk b/Android.common.mk
index 8a752a5..98be839 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -76,7 +76,7 @@ endif
ifeq ($(MESA_ENABLE_LLVM),true)
LOCAL_CFLAGS += \
- -DHAVE_LLVM=0x0305 -DMESA_LLVM_VERSION_PATCH=2 \
+ -DHAVE_LLVM=0x030$(if $(filter 5,$(MESA_ANDROID_MAJOR_VERSION)),5,7) -DMESA_LLVM_VERSION_PATCH=0 \
-D__STDC_CONSTANT_MACROS \
-D__STDC_FORMAT_MACROS \
-D__STDC_LIMIT_MACROS