From: Rob Herring <robh@kernel.org>
Date: Wed, 3 May 2017 19:35:22 +0000 (-0500)
Subject: Android: drop LLVM support on Lollipop
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=06260da16e74f69273a857099b8537b3c957de44;p=mesa.git

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 <robh@kernel.org>
Reviewed-by: Chih-Wei Huang <cwhuang@linux.org.tw>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
---

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