diff options
| author | Mauro Rossi <issor.oruam@gmail.com> | 2015-12-22 13:26:51 +0100 |
|---|---|---|
| committer | Mauro Rossi <issor.oruam@gmail.com> | 2016-11-01 20:41:59 +0100 |
| commit | 8f3d32ced7a3413a24a494e575949eebab5c85f6 (patch) | |
| tree | 91dc0af65c60fb1cb8c1bccc98c4e348677ad9c9 /src/gallium | |
| parent | 9278d180725cdf444dd65c580d1382ea26de64d0 (diff) | |
| download | external_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 'src/gallium')
| -rw-r--r-- | src/gallium/Android.common.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/Android.common.mk b/src/gallium/Android.common.mk index 7c6c7ac..757716f 100644 --- a/src/gallium/Android.common.mk +++ b/src/gallium/Android.common.mk @@ -34,7 +34,7 @@ LOCAL_C_INCLUDES += \ external/llvm/include \ external/llvm/device/include \ external/libcxx/include \ - external/elfutils/$(if $(filter true,$(MESA_LOLLIPOP_BUILD)),0.153/)libelf + external/elfutils/$(if $(filter 5,$(MESA_ANDROID_MAJOR_VERSION)),0.153/,src/)libelf endif include $(MESA_COMMON_MK) |