summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Herring <[email protected]>2017-05-03 14:35:22 -0500
committerEmil Velikov <[email protected]>2017-05-11 13:52:21 +0100
commit06260da16e74f69273a857099b8537b3c957de44 (patch)
treec22fce28feb2e57b478b8078ba1985c0dec7031e
parent4c0c3719dc4323cbfbee4932436422057ddb944c (diff)
Android: drop LLVM support on Lollipop
Mesa no longer supports LLVM 3.5 for any targets we support. Android-x86 adds support for llvmpipe which could work, but android-x86 for L is using mesa 11.0 anyway. Dropping this support enables clean-up of libelf dependencies. Signed-off-by: Rob Herring <[email protected]> Reviewed-by: Chih-Wei Huang <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
-rw-r--r--Android.common.mk4
1 files changed, 0 insertions, 4 deletions
diff --git a/Android.common.mk b/Android.common.mk
index adfe4a17307..58f2bcfc7e0 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -87,10 +87,6 @@ endif
endif
ifeq ($(MESA_ENABLE_LLVM),true)
- ifeq ($(MESA_ANDROID_MAJOR_VERSION),5)
- LOCAL_CFLAGS += -DHAVE_LLVM=0x0305 -DMESA_LLVM_VERSION_PATCH=2
- ELF_INCLUDES := external/elfutils/0.153/libelf
- endif
ifeq ($(MESA_ANDROID_MAJOR_VERSION),6)
LOCAL_CFLAGS += -DHAVE_LLVM=0x0307 -DMESA_LLVM_VERSION_PATCH=0
ELF_INCLUDES := external/elfutils/src/libelf